I also went for the ED edition, as it should consume much less. We'll drive pretty much the same car then!
I have one remark as you ordered your car on monday, Dafila. Not sure if you noticed it, but BMW introduced a new pack (JOY Pack) on tuesday I think. This pack includes metallic color, alloys (also sport line alloys) and multifunctional steering wheel. My salesman didn't know about the new pack yet, so I ordered my car with those 3 options separately. Yesterday I gave him a call and he changed the contract for me, including this new pack, and received the 200 euro pack discount. So might be useful for you