Technology is improving veeeery slowly. But resource constraints will only get worse. Tesla is farthest out in front, and so is already dealing with this issue. They have gone to a 40 year old technology, for their affordable models, leaving exotic chemistries for those willing to pay through the nose. VW, and now Ford, announced they are going to that same 40 year old technology for their affordable EVs.Battery technology is improving all the time.
In 20 years you will have a battery the size of a brick power your car with all the heat you want.
Nobody has the slightest idea what we will be doing in twenty years, but the Pentagon has to plan for contingencies anyway.