Your fuel pressure looks okay. With the CEL going away, it looks like you have the P0138 resolved.
I didn't see any mention of tuneup hardware, which the importance of cannot be overstated. Fresh Champion copper plugs gapped to .035, new quality plug wires, distributor cap and rotor.
Failure to freshen tuneup hardware can result in "the chasing of your tail". I don't mind chasing tail, except when it's my own!
Also never hurts to get a compression test done. This test is a good "snapshot in time" of the internal condition of your engine. For the 4.0 engine, the spec. is 120-150 psi, with no more than a 30 psi variation between cylinders. Never a waste of an hour of your time to get these numbers.
99 Cherokee, 4.0 AW4, NP242
Past Jeeps: 49 Willys, 81 Scrambler, 88 Comanche
Without "data", all you have is an opinion!