Yikes.. What an ugly story.. I hope it works out for you... My only thought is if you aren't receiving the proper satisfaction from the dealer bypass them and goto BMW North America directly. And I would press the dealer to give you a 1YR warranty on any "engine swap" related issues if possible..