Regardless, I would get BMW involved and maybe they can assist in making sure the dealer does right by you. Also, they may be able to offer you a longer warranty period.

I don't know that from experience but that would be what I would try. Sorry to hear but good luck!