My father in-law uses our VW/Audi/Dealer for his business vehicles, so gave his salesman a call and told him to get a move on with my car.
I got a call from them an hour ago saying it's now ready. It had a faulty ignition switch - replaced under warranty.
Up early tomorrow morning to collect it before work!