we're almost twins :-) Nice job on getting it all done...that labor is crazy in SF, I paid about in the $3's out here (but our rate is $135 an hour)...
What you did was correct, always force them to price match online, they hate it, but they eventually do it.
I am waiting to pick her up with the M Performance Spoiler, so we'll be extreme line twins (I'll be the MG Base with M Performance goodies and you'll be the MG M Sport line with M Performance Goodies!)
2012 335i Mineral Gray
M Performance Whore: PPK|Exhaust|Brakes|Performance Suspension Struts & Springs|Black Kidney Grilles|CF Spoiler and Mirror Caps|Bav Stage 1 upgrade |M Sport 400M|BMWF30.com