Well my GTI has just returned from the dealer with the dreaded sunroof rattle fixed! The issue was with some clips and the headlining . . . but it has all been resolved and I am very happy with the result.