Update: The sales manager did not call back the day he said he would. I left a message on my CA's voicemail saying that doesn't help the situation and they need to get back to me. CA emailed this morning saying they will deduct $258 from MSRP, and that I will also be getting the M-floor mats. This was a close call; I really was ready to give up the car. So, I'm all set and excited about the M3 again!

Fantastic!! Really glad that worked out for you.
Still for not calling you back.