Again, sorry if this is a WOB...
Talked to the Service Manager and the Shop Manager today. They were both very nice, listened intently to all of my problems and came up with some solutions.
The car goes back in at a date of my choosing, and no 4 week wait. I get a rental / loaner car until they finish my car.
The shop manager will ride with me, listen for the problems and personally QA the repairs when they are done.
The car will remain at the dealer until everything is done 100% perfect.
They are also replacing my splash guard for no charge, regardless of whose fault is that it fell off as a goodwill gesture.
All in all, I left really happy. They want to get all this over and start a new relationship (their words) and they seem really willing to make it right.
Okay, happy again! Did a couple high speed turns and one four wheel drift on the way home and remembered what the M feeling was all about...