Took the car to VW today and they have confirmed that it needs a new water pump. The part is on back order in Germany with a 3 week wait but they have managed to source one from another dealership. I should get the car back next Friday. At least it is still under warranty.
Matt