I'm almost certain the idling problem, is caused by the idle control valve, at the back of the plenum. Mine had the same problem when i first bought the car. I pulled it off and cleaned the carbon out of it, and that seemed to fix the problem.
There is a thread on here from way back, which explains how to do this, don't ask me where though.