Earlybird,
Your problem is probably the idle speed control module (Leerlaufdrehzahlregelung). It is located in behind the glove compartment & to the left. They develop bad solder connections over time giving intermittent surges in idle.