Ouch. I got a guy in Sch'dy that does a lot of work for me - also Quality Foreign Car in B-Spa is really good, all they do is Bimmers. Once you get these annoying quirks ironed out, they really are good trucks (yeah, I called it a truck)
Oh, and don't get gouged on a battery if you need one, Wallyworld has an H8 Group 900CCA in stock for about $130.
Good luck - If you see a black one in town, wave, could be me. But.. I've waived at other X5 drivers, and it's usually some basic drinking a starbucks totally oblivious.