This is a familiar trait for the 16V. Before you contemplate expensive repairs, try adjusting the CO mixture at idle.

Somewhere in the archives is a great post from Adrian Eckenrod that explains how to adjust the CO idle mixture (a tiny allen screw behind the airbox). I had the same problem when I had a 16V and by changing the idle mixture it went away.

David Hendy