Sounds like ignition and fuel pressure are fine. It could simply be a bad O2 sensor. If you could get codes from the ECU that could help.
And apologies if I missed it, but when the issue first started and you felt it was running rich, did you ever notice any black smoke. If so, how do the...