So I did some testing with the TPS - and when I removed it - the idle immediately settled down to normal (just pulled it off - did not unplug). I could turn the little sprung wheel with the blade of a screwdriver and change the idle. Then I noticed that it seemed to be sticking and not returning to center - and sometimes it didn't respond when turned. So I am replacing it and we'll see what happens - I think it was the sensor.