I'm actually in this boat right now. I need a new car by October. I don't currently have a reservation for anything. The salesman told me it would be at least 12 months for delivery if I reserved one now. So I'm going to test drive a Fisker Karma in a couple of weeks. If the Fisker command center doesn't annoy me as much as some other Fisker owners, I'll buy the Karma. Otherwise I'll get the Porsche Panamera. If that's the case then I won't get an EV for at least another 3 years. I love the Model S, but timing just isn't right for me.
Have you thought of buying something used until you can get a Model S?