Conversion kits to turn the CV style axle to a ujoint style are available. Also certain XJ axle shafts are a direct swap. Not sure such though.
EDIT:
Anyone have any thoughts of on tying in the rack?
I wonder if one could scavenge the d30 and d44 off of a WJ? The D44a in the back would need some reinforcement because it is made with aluminum but should work. And maybe a good selection because they are cheap and have the ABS setup with disc brakes.