Well...it at least BMW NA worked with you and offered the new engine. Given the circumstances..I might go for the new engine because that means you get all new everything under the hood basically with no mileage on the new engine. I do understand your dissatisfaction though, Seems they should've just done the service bulletin on your car free of cost..

I would heavily consider the new engine swap though..