If I were in your shoes, I'd get into an e92 now. History tends to repeat itself so I wouldn't even consider the M4 until maybe year 2-3 of its life...BMW should have all the bugs worked out and an LCI in place by then.
I'm hopefully optimistic that the new powerplant will be as exciting as our
V8...