get a new distributor gear....they are plastic and will eventually fail. also buy 2 ballast resistors (it has electronic ignition right?) replace the current one and keep 2 spares in the glove box.
you must have mixed some Prius moon beams in your tank to get 30mg out of a jeep 4.0
also, in a few years? don't wait too long because 2025 EPA mandate is 54 mpg.
i was tracking /6 builds years back but never did one of my own. one thing i remember reading as the 2.2L dodge turbo pistons and rods fit in the slant.