I feel ya. I'm a chapter officer in the BMW Car Club, but we just placed an order for a Model 3 for my wife on Saturday. The only thing even remotely on the horizon for BMW is the iX3, which will be produced in China (even though BMW produces all X3s in the US currently). It will only have 250 miles of range. And it launches in 2020.
I currently drive a 530e plugin hybrid. I tell anyone who will listen not to waste their time with it. It has 15-20 miles of real world EV-only range. I live in a small town and it typically isn't enough for me to drive across town and back if I have the AC on. If I wasn't so upside down on the lease (12 months in), I'd be ordering myself a Model 3.
My wife made me get rid of the 2015 M3 I had prior to the 530e. I greatly miss that vehicle, but now the joke is that she's going to be the one with an M3. Just a slightly different kind of M3.
My next vehicle is not likely to be a BMW. It is mostly likely to be either a Tesla or a Porsche Taycan. Maybe BMW will have something worth my time in 2023. And it's so sad as they were ahead of the curve with the i3. And then they did... nothing.