if i was to do it again i would definitely do a niner or a 4.7L WJ
i know you had a ZJ and probably know all this, but i'll just throw it out there. i didnt know till i had spent years reading/working on Grands
a wj is 63.5 WMS where a ZJ/XJ/TJ is 60. something to consider with an axle swap using, say, a 8.8 at 59.5 WMS (wheel spacers would work and would be needed to convert from 5x5 to 5x4.5
WJs only come with cv shafts in the font axle. if you want ujoints you have to have custom inner shafts made
96-04 Grands with a v8 have the 44a rearend. its safe to 33s locked and 35s locked and trussed. all niners have lsd, some others do. obviously lsd means no aussie. iirc, the shafts are only 0.012" smaller than the 8.8 shafts. problem is the tubes spin in the alum housing.
niners have e-fan stock
most v8s have a 6ball cv joint at the axle end of the front driveshaft. if you lift it over 2 inches you have to convert to a regular ujoint.