Indy Specialist it is then. As soon as my initial 3 year VW warranty expired, straight to local Specialist, cheaper labour rates and better work. Always good to talk with a GTI enthusiast that is actually working on your car rather than through a Service Receptionist who speaks to the Service Manager who speaks to the Service Tech.
In fairness to VW, I had zero issues with the Dealer, Land Rover were a nightmare at times.