Have you checked the fuel pressure at the schrader valve on the fuel rail yet, That should tell you if your having a fueling issue atlest from the injectors back.
1997 XJ Sport 2 Door- High country suspension and skid plate package.
2006 TJ- Custom lift 4in Full traction springs, OME shocks, Kilby skid plates and bumper, Full traction 3 link in rear, JKS control arms upper lower, Banks exhaust, Edge trail jammer, 4.56's and true trac front, Eaton elocker rear. D30, D44
1995 YJ Rio Grande- 4.0l Swap 3.5 in 4wd hardware lift, Ford 8.8 Rear 4.10 gears.