Sounds like the idle air control valve is sticking in the throttle body. Remove the 2 torx screws holding it in (opposite side of TB from TPS) and clean the carbon out of the orifice and plunger.