Wow. that... blows...
I'd definitely write to BMW and tell them what's up. I doubt it'll do much good but at least you can go on record saying that their inability to fix the problem the first time has caused you to spend exceedingly more money on the car.
VOB gives 2 days free... 2 days != $800... Insurance claim it?