Since I see that you're in Calgary, I would highly recommend Vitek's AutoWorks for a good BMW indy shop to work on your ride. They are located just off Edmonton Trail and have always done excellent work for me and my X5, at a reasonable price.

Call 403-452-0200, Aaron is usually the guy I deal with

Cheers, Chris