Sorry to hear that MrM3! I had similar experience with one of the dealerships in Calgary (BMW Gallery) when I purchased my previous car. I negotiated a lot for purchasing my current M3 from another dealership in Calgary (Calgary BMW) as well but have received awesome service there.
Calgary BMW is much further to my house but I still always go there. Funny thing is that these dealerships are both owned by the same person lol
Anyways, welcome and enjoy your car!