Was it definately the TPS that you disconnected ??, as they won't run properly with this disconnected, i would try a new TPS or Map sensor.

My fan swich used to play us all the time, got to a point where i wired a switch in just incase !!!

A common problem not engine related : Also worth checking your gearbox mounts are ok, i remeber being stranded when they were worn and let the engine move enough for the alternator to wear through the water hose late one night !!, oh yeah plus the crossover pipe usually dents your bonnet !!