I work in the motor trade and my role connects (pardon the pun) me to most manufacturers. It is clear that nearly all are in a phase (chuckle) of switching (not intended) to full electric power.
The market has pretty much gone for new volume diesels, (although I've just bought a Mazda CX5) and some mainstream manufacturers have dropped them altogether (Porsche and soon other VW brands to follow)
The new car market has really slowed, mainly for the reason sited by the OP, ie, don't want to buy another petrol/diesel right now and its a bit early to be sure of EVs.
Interesting times but having bought an I8 last year, I'm no longer interested in buying a high performance petrol Aston, Porsche etc. And that's from a die hard petrolhead!
The next 12 months alone will see a massive wave of new EV's coming onto the market. Oh and with it is the threat of the Chinese invasion. They are market leaders in this tech and can build sensible EV's to a more palatable budget...
