Yeah I just cleaned mine, too. I'm having similar issues as yours... I believe that the unit is caled the Idle Air Control Motor, or IAC. It's about $50 from the parts store.