Just had a call back from Cardiff Audi. They apologised and said they would take the car back and fix the bodywork problems. They'll provide me with a courtesy car and reimburse petrol.

What a fantastic service.

I should have asked for the manager while I was there, would have saved the hassle.