No, Keep what you have. Cherokee's have the same ujoint axleshafts as the TJ, and older Cherokee's have smaller weaker ujoints.
Some Grand Cherokee's have CV axleshafts but you don't want them, they're weaker than what you have in there now.
The only upgrade for you short of a complete axle swap would be aftermarket hardened axleshafts and high-zoot ujoints.