i know this is a jeep website... but have you considered a toyota landcruiser diesel? lots of them have been imported int ocalgary, they have low mileage, and ive seen them being sold for 10G. very affordable when you consider what you'll pay for an xj and swapping parts. just a thought.
if you are hardup for a jeep. id say stick with a 4.0L , ax-15, np231. look for hi pinion front dana 30(non vacuum disconnect) and rear chrysler 8.25. that will be your best bang for the buck. this combination occured around the 1995 and up model years.
all these options can be upgraded with better parts, ie. chromo shafts, lockers, gears, engine upgrades, better clutch, low range for the t/case. add a swing out tire carrier with two jerry can racks and you're set.
xj owners please confirm these options.