ISV & Full Throttle Switch

[mlemon90q@butter.toast.net]

Hi Q-Listers!
I've been researching the archives, trying to keep up on all the recent posts on ISVs, but I need a bit more info. My '88 90q has been idling between 800 and 1200 rpms. It seems to run rough in 1st and 2nd(like it's trying to cough up some phlegm), but smoothes out in 3rd especially above 2000rpms or so. It seem to be better overall when warm. There has been an intermittent "whirling" kinda mechanical sound at the location of the ISV. The two hoses connecting to the ISV are new. I cleaned the ISV and it's contacts and any other contacts I could reach. That helped at first, idle-800, and smooth in all gears. A few hours later...back to same old tricks and worse! After driving about 20 mins or so, it got real rough(LOTS 'O PHLEGM) then the check engine light came on. I dumped the codes an only got 2123. The Bentley is on order, but I think that's the full throttle switch. Cleaned the ISV again, with some improvment, but not like that brief bit 'o smoothness(if only I woulda' left it runnin' ;-). So should I order the parts or what? 
Any wisdom would be appreciated!
TIA


--
Michael Lemon
Kansas City, MO
'88 90q
--