As a follow-up to my other thread...
I took my car to Bimmers Only in Bedford Hills. Graham is the owner there, very easy to work with. Did what I needed to get done, as well as found some other issues that have been plauging the car for quite some time that the dealer did not point out. Also did a once-over of the car and noticed the RTABs in the rear need to be replaced soon, but didn't get that done yet. Hourly rate is higher then dealer, but th end result was extremely reasonable for what was done to the car. I will definitely be going back here from now on, and it's a bit of a trek from Yonkers, but well worth it.