I have a complete D30 front end out of an 88' Xj that seems to be in really good shape. It has everything for the front suspension of an Xj still on it ( Control arms, Steering, Trackbar, Ect.). It is a non disco. and is 3.55 gears. I know it isn't the year prefrence you want but the older ones are HP. and i think that the newer ones aren't. Let me know if your interested, And if your going to Moab then i can bring it with me and we can swap there. If not then i live near SLC Ut. and could meet you somewhere.
HTH
Jerm S.