Great to hear your take on this. I loved the Z4 too.
I think I would suggest option 2 for BMW. The difficult thing now is that half the industry is doing some version of the BMW flame surfacing. If they want to show that they are leaders, they need to break away again. I think Mercedes has successfully done that with their latest generation designs.