1998 S70 GLT idles high after Timing Belt change & Tune up

[lamplighter55]

So proud I was able to replace the TB and tune up my 1998 S70 GLT (w/ only 65K) with info/pics from this website. The car started fine and ran well while in the garage. Took it to highway and "Check Engine" light came up within a few minutes of driving. Noticed idling really high at 1500-2000rpm. (The car was going at 40mph without any pressure on the gas pedal) OBD displayed error codes P0101 (Mass or Volume Air Flow Circuit Range) and P0505 (Idle Air Control System). I went ahead and cleaned and MAF sensor and Idle Air Control Valve (again with helpful hints from this website). It ran smoothly at 800rpm for a while. Shut the engine and re-started after 30 min. it goes back to 2000rpm. (Cleaned the IAC valve a 2nd time, didn't changed anything) I rev the engine a few times, it drops to 800rpm and immediately returns to 2000rpm. I'm about to pull my hair out, any helpful advice is appreciated. Thank you.