UPDATE

So I bought a new cherokee. Here are the specs

1996 Cherokee Classic 4x4
189k
D30/D35 with NP231
5sp AX-15 <-- this is my favorite part

Pros:
completely rust free
no oil leakage or burning
new headliner
clean interior
never been lifted

Cons:
leaking power steering
brakes barely work
i can smell fuel
no front driveshaft at the moment

Here are some pics

Just be happy it doesnt look like mine...

No I'm quite happy with it. I kind of wanted a project to work on. I have plans for this one

U gonna swap everything over to that one or are you gonna use good body parts to slap on the other?

Definitely going to swap everything over to the 96. The pictures don't show it but the collision actually twisted the unibody on my 2000 a little. I'd much rather switch all my lift parts and other good parts over to a straight unibody... especially one with absolutely no rust. Plus I kind of like the look of the older xjs. My brother and I have a full shop and we could even swap the engines if we wanted.

good luck with all the swapping of the parts! It'll be a bit of work but since you have access to all the tools it'll be a great. I go back and forth on which model XJ I like. I've got a 97 but sometimes wish I had a 96 or older. Oh well. guess I'll just have to buy another!