I was recently in the same position with the daughters jeep and I ended up sticking with the 4.2. Now we already had the 4.0 HO head and header with a Motorcraft 2100 carb just for background.
Things I can tell you about the 4.2;
It dumps its torque so low that putting it into a jeep that had...