Get your tickets to THE BIG THING 2026!
I hope everything works out for you and the xj. If worst comes to worst, a used engine/donor rig can be had very cheaply and the engine swapped in a weekend.
Chris, for what is worth, I found a good low mileage 4.0 for my daughter's XJ when it's motor went south for $500 at the local boneyard. The biggest problem with the swap is reaching the bellhousing bolts on the back of the block as there's not much room to get yer hands in there.
Hope all goes well with your Cherokee. It is always the worst waiting to find out what the problem is. Also stoked to see what tire carrier you got and what it looks like, I need to get one as well.
Try jeep-engines.com. I think the one you need is around a 1600 add a couple hundred to ship and install and your good to go. Comes with nice warranty also.