Sounds as if you are with the wrong Dealer Selcouth! In my experience they do vary enormously, but a visit to the works usually sorts out the issues.
They did try to fix the water ingress but it made absolutely no difference whatsoever, other than to my wallet (the bill was horrendous for no result

)
I don't know the age of your Aero, but from the mileage and your avatar I guess it's relatively new? Wasn't this a warranty issue?
2007 S3 (57 plate). I don't think I have any warranty remaining - I was only given a 6 month warranty when I bought the car and obviously I'm out of that now and I assume that it's not under any sort of factory warranty?
In future, I am going to take my Aero elsewhere as I do feel I'm getting royally ripped off. It's a good excuse to go for a nice long drive too so it's no great hardship
