TPS tested good.
Today I took the TB off for a more thorough cleaning. I had only cleaned it from the front a while back. Damn was it caked up. Also found that the gasket for the TB/intake was leaking slightly at the bottom. Scrubbed all and installed a new gasket.
Cleaned the MAF again and the EGR. Installed the upstream O2 I had for it as well (AC/Delco)
This issue only happens after 30-35 min of driving. Otherwise the car runs perfectly.
I stopped for gas today shortly after it started shifting funky and had been driving for about 40 min. Shut the car off long enough to pump 11 gallons of gas. About 5 min. Fired up, idled fine. Shifted correctly the remaining 10 miles home.
Where to go next....
