I just re-read this entire post, to refresh the story. No where do I see any mention of testing the O2 sensor. Try this. Disconnect the O2 sensor connector. Then test drive it. If the 2000 rpm problem goes away, then your problem is in the O2 sensor system, O2 sensor, wiring, O2 sensor heater relay, or exhaust piping issue (leak?).
What all did you do just before the problem originally started?
No one has mentioned the C-101 bulk head connector. It is notorious for connections looses after 22 years. It is near the Master brake cylinder on the firewall.
Interesting that replacing the TPS helped. Also interesting that replacing part of the harness helped, but what parts of the harness were replaced?
Could be the fuel pump, I have heard Airtex fuel pumps are no good from many people, but some of your comments make me doubt that is the issue. Try the disconnected O2 sensor and do the drive test first. Try cleaning, and servicing the pins (make sure they are tight) on the C-101 connector.
Have you checked fuel pressure while running the RPMs up and down quickly? have you checked the FP regulator for a diaphragm vacuum leak of fuel?