Could try TwinStar at 791 Kingsway in Vancouver. Ben and Tim are super friendly and do great work. I've had to bring our former B6 Avant and the current F48 X1 there and look brand new afterwards. They're also car guys so you'll be in good hands!
http://www.twinstarcollision.ca
Good luck!
Fred