Man, I'm sorry about your wj. If you go the Cherokee (xj) route I think you'd be pleasantly surprised. Generally, they're a little more rugged than the wj and lack in creature comforts but they are cheap, the after market parts are insane, and the 4.0 L6 could be launched into the sun and still work. Best motor I've ever owned next to the 22RE in my truck.
Generally people like the 4th quarter production 96-99 cherokees for a few reasons: In 95 the dana 30 front axle got a little beefier. In late 96 switched to the 29 spline C8.25 axle (much stronger).
99 emissions laws caused Jeep to put more restrictive catalytic converterson so Jeep upgraded their intake manifold to make up for the loss of horsepower. Result: Put a 99+ intake manifold on a 98 or older cherokee and get an extra 20-25 hp.
hope this helps
Personal opinion: get a manual transmission, the AX-15 is the best transmission Jeep ever used and is found in some Toyotas I believe.
If you do, let me know if you have questions. If not, like it was said before, go for a vehicle with a solid front axle.