Got my GSi back after 5 days at Vaux. They replaced the water pump, rollers and tensioners. Sounds good now. Really quiet. Took a while to get the bits and vaux didn't have a car, so they got Enterprise to pick me up and I got a 55 SXi Astra!! So I was well happy. Full marks to vaux!!