I am in the same boat too. My wimpy 2.5 really gets to me after driving my '99 with the 4.0. Unfortunately you WILL be money ahead in just purchasing a used XJ with a 4.0 from the factory. Once you figure in the downtime, labor, time of hunting parts, fabrication, electrical wiring and the time to tune you WILL be waaaay ahead of the game if you just get an XJ with a 4.0. If this is a project jeep and you really REALLY want to burn some $$, then possibly a GM 4.3 V6 swap. Plan on major fabrication work to the suspension and drivetrain, plus electrical. Probably not any more out of line than what you are already planning though.