hey,
dunno if this will help at all but ...
I have a '90 1.6 Driver with poor auto choke cold start problems, took it to Clive Atthowe Tuning in Norwich. Got a full and comprehensive report, cost 76quid, apparently she suffers from common golf carb problems.
Reading from the report, try the replacing:
Waxstat – which on my dub is causing high idle speed (choke vacuum pull-off unit failed causing over choking and rich mixture/ miss fire from a cool engine.) Also was told that genuine replacements are hard to find and costs a few sheets

it's all worht it tho, huh?

Rich