Check out ur Idle Air Control Valve..
Located on the intake manifold, basically is a small stepper motor works like an EGR...
Usually these get carboned up and the idle starts to act up.

Just my $0.02...