The coolant temp sensor is a likely candidate as well, especially since the symptoms changed when you disconnected it. In a thread here somewhere, I posted the temperature/resistance curve chart. You can see if your coolant temp sensor is out of spec with an ohmmeter and this chart.

A really off temp sensor will make the car die, ask me how I know.....



-tp