Exactly the experience with my car. First had to ensure that the AAV was closing completely at less than 70ºC, then turn the idle air screw down until the surging while cold stops, which was around 1500 rpm. Results in warm idle around 900 rpm warm (in P or N).