If you do happen to need a new engine, I have one I just pulled out of my 2000 TJ. 90k miles. I'm the original owner so it's been maintained. RMS a done a year ago and doesn't leak. The engine is in Sedona.
Look around, you should be able to find a 4.0 at a reasonable price. I picked up one with less than 100k for 400.00.
I was using it for a stroker built. The seller told me it was well taken care of, and he was right. I tore it down it was like new inside.
The cylinders still had the crosshatches. The bearings had very little wear to them.