Yes, keeping the 4.0. I found a TF727 rebuilt with a cummins clutch set/rebuilt kit that comes with the flex plate, shifter, cables, cooler, and CPS relocation parts. Going to swap it in.
I need to figure something for a transfer case that will hold up, but hey at least I'm making progress again.