It's hard to say due to the relatively little official info on what's going on not just next year, but the year after that. You're in a good position either way (there are worse car choices than BMW so even if your wife prevails you're OK).
What's most telling though is the dealers. Buy not just the car, but also the dealer. If you can't get responses, see how they are in person, and if you don't think they're the type of people you'd enjoy giving $35K, you might weight that into your decision too I suppose.