I have the exact same problem with mine. Its been in the shop for weeks now as the local guys here cannot seem to resolve the issue.
(details here: I love my GTI 7 but... - GOLFMK7 - VW GTI MKVII Forum / VW Golf R Forum / VW Golf MKVII Forum)

Any idea what exactly they did to yours? Maybe a contact email address for the workshop that fixed yours?