I'd be very surprised if they dropped the X2 M35i. The even-numbered series is all about sport. Since they're not dropping the X2 altogether, it's logical to assume an upgrade is in the works. Time's running out on the gas engine though.
An X2 M35i with factory quad exhaust would be pretty sharp! And modern electronics in the headunit? Naaah, too much to hope for.