The TPS will effect the shifting a bit. The MAF will usually cause the engine to lean out and run poorer, not shift funny.
I had a bad TPS a few months back that screwed up my idle at times. When I replaced it the 1-2 shift was smoother. It had 650-700 ohms at idle instead of 400 or so. Problem with mine was it was intermittant. Caught it in act finally. EEC test said it was OK.
Your problem sounds more like vacuum leaks, ignition or dirty injector problems. I ran a couple of cans (one per tank) of Berryman B12 through my engine. It cleaned something because I can run 87 octane with no knocking again. Probably a bit of carbon build-up...
