I am not sure about this, but couldn't you use the long axle shaft from the Dana 30 you have in Cherokee the older Dana 30 with the disconnect? You could cut all the brackets off of the current axle and weld them into place on the older axle too. Like I said I haven't tried the shaft swap, but if the splines and the shaft length are correct, I don't see why it wouldn't work.

Sean

99 XJ Sport 2 Door, 4.0L, 5 speed, all stock. Daily Driver
79 F150 Standard Cab Short Box, 400ci, NP435, NP205, 35" SSRs