"I just talked to my mechanic and he thinks the idle valve could be dirty. He said those things get gunked up and cause those kind of symptoms."
I may be too late, but you can shoot some throttle body cleaner in the orfice of the IAC while idling. I've cured your problem doing this many times.