I've recently had the head gasket replaced on my mk2 gti 16v and had the head skimmed. Not long after i got it back the car began to idle at 1500 to 2000 rpm, sometimes it sits at 2000 rpm and other times it builds up from 1000 to 2000 over a second or two. I've checked the throttle cable and its not that. Other times it dies when i stop at a juntion etc and won't idle at all. Its really beginning to piss me off!!