If I ever take the next step with the Jeep engine, it will be a 4.7-4.9 stroker..... maybe a turbo too. You can punch it out to 5.0 but then the cylinder walls will be pretty thin.
The last two production years (00-01) have an ECU that really does not like changes in manifold pressure, this cam had to be custom made to work around it and produce close to stock vacuum signal.
I want to stay with the original 4.0 engine and ECU. The 4.0 is arguably one of the best sixes ever made, with of course, a couple of shortcomings... nothing too bad.

Jeep tuner can adjust a lot of things in a matter of minutes, including speedometer correction etc... and I think that's what I'd do. I could change between economy and power programs in minutes, myself, any time, for one time investment of around $300 for the programmer. And I could always go back to stock program too.