+1 It's best to get a VW body shop to do these kind of repairs - warranty is not affected and quality is assured.