The anti-corrosion warranty is 12 years, so yes. As long as the paint is original or has been done by a VW approved garage.
Tara, I would complain to the dealer principal and VW UK. The dealership are still getting money for this job so they will lose out if you take the car out and go elsewhere. Make it very loud in the service reception that you will not be coming back to them and you will inform family and friends of the poor service. Turn up unannounced tomorrow and just take your car away. My 2p anyway.