I wouldn't rule out a cat... It's the most over-looked problem, and on many cars!

I'm not there, and I have no idea what all you've done, so I can only offer my thoughts/opinions.




To add;
Fuel delivery is important, and if you see remnants in the tank, then it needs to be cleaned/cleared completely before moving on..