Save up a bit more and do European Delivery (saves $$$) to get the options you want on the M3.
I faced a similar choice when my 1M order didn't work out. 335is was within price-reach, and for sure it is an awesome car. But if you really want an ///M, you better get one. Because every time you look at the M-sport steering wheel in an 335is, ya might have a pang of regret