My advice: switch cars. The Bolt is a short-distance car, until they figure out the battery problem. Good for around-town, not long commutes. Let him drive the Miata until you get the Tesla. Unless you've got a good back-up plan if the Bolt breaks down during the commute. He's the one in the bow-tie?
Your MY order will be 3-4 months after your order date, assuming no new manufacturing issues for Tesla. So probably December. End of Q4 for west coast deliveries.
If you want a Tesla sooner, your only choice is to jump on current inventory.
My 2 cents, worth every penny you spent on it.