Sorry to hear that their sales experience has not improved...no surprise though.
Regardless of where you end up buying, I do have say that you can at least service your car with Baron with confidence. I have had nothing but top notch service there and they have recently made some improvements to the waiting area etc.
Good luck and hope to see your future F30 around. Let me know where you end up buying...I am in the market in the very near term.