2006 Jeep TJ SE 2.4L Frequently Throws P0171 Code After Switching to Stock Intake - Diagnosis & Fixes

I recently discovered this forum and am impressed by the structure and community focus. I'm hoping someone can help me troubleshoot a recurring issue with my 2006 Jeep TJ SE 2.4L. While driving to the grocery store, my Jeep suddenly died as I approached a traffic light. I was stranded on the side of the road for several minutes—no one stopped, which wasn't surprising given how it behaves under stress. When I tried to restart it, the engine would fire for just a millisecond before dying completely. After removing the air filter (which is relatively clean and new), the vehicle finally started and ran reasonably well during my drive home—even if not as smoothly as normal. Upon returning home, I scanned the OBD2 system and found the P0171 code: P0171 (M) - System Too Lean (Bank 1) A lean air/fuel mixture has been detected, indicated by an abnormally high fuel trim correction factor. I previously used an aftermarket intake system for off-road use, but due to repeated mount failures, I switched back to the stock intake about a week ago. During this transition, I repositioned the MAF sensor (located just before the throttle body) to align with the stock intake and throttle body boot. While no physical damage occurred, I'm wondering if this misalignment could be causing the lean condition. I’ve also considered whether the front oxygen sensor might be faulty or providing incorrect readings. The vehicle has only 22,000 miles on it and is outside of its original 3-year/30k warranty coverage. At a local tire shop today, they performed a vacuum leak test—no leaks were detected. They suggested the issue could be related to the fuel pump or filter (both located in the tank). Before draining the tank and replacing these components, I’d like to understand if there are other potential causes. The problem has recurred: after resetting the OBD2 codes yesterday, my Jeep died again at a similar distance from home. It wouldn’t start for about 5 minutes regardless of attempts—then it started, ran roughly, and triggered the same P0171 code. Afterward, it runs smoothly but with the check engine light illuminated. I recently spent $1,000 on new tires and am eager to get back into off-road adventures this weekend. Any insights or diagnostic steps would be greatly appreciated.