try replacing the idle control valve with another one, if its fucked a clean wont fix it Im having similair problems at the moment ! I unplugged the electrical connector from my idle control valve the other day and the car was seriously hunting from 800 rpm right up to 2000rpm (so I plugged it back in ) Im getting a decent second hand one in the next few days so hopefully it will fix it !

Duncan