"EV choices today are extremely limited"
Internal combustion cars were extremely limited in the 1910s. And they had the advantage of extremely cheap fuel, which is an advantage that EVs lack now.There will be breakthroughs in battery technology and the EVs will explode beyond demand.
I would love that, but even if battery tech suddenly hit the market, it would take some substantial infrastructure changes to enable a flood of demand.
There are plenty of promised battery improvements that would be awesome if they were successfully implemented. Other than cost reduction, power density and battery life, time to charge is huge, all these are promised and needed. But time to charge would be restricted by the lack of stations. And therefore limit the demand. All the plans Tesla motors has, hardly puts a dent in it up to now.
I mean the best current estimate is a 10min recharge. That puts about 2wice+ as many people at a station than the current rate. That equals out to twice as much needed parking and connections at stations as we have now(for gasoline), plus the energy capacity needed. And time is precious, so some people will opt for other systems, including ICE.
Even flow batteries will take a few extra minutes to 'exchange' and that offends some people's logic on adoption of the tech.
For sure these other options such as hybrid, fuel cell, range extended, flow batteries will need to come into play to make much of a switch to the EV drive itself. After that you have a chance at implementing battery-only drives en mass. The best guess is that there will always be some mix that includes all the above plus ICE for a very long time, at least 20years.