Have a look under the throttle body and make sure the idle speed adjustment screw is still there. Mine fell out a while back and caused the problems you describe.

Also check all vacume pipes. If it has a DV try removing and see if this cures it a leaky DV can also cause these symptoms.

HTH