Yes, but how soon? In the interim, warfare creates enormous demand for fossil fuels (oil is very portable w high energy density, no renewable yet that can compete). Fossil fuels may be needed to help "transition" to renewables, hopefully using carbon capture. Other portable/transitional is currently nuclear and we all know that downside. As you said, we desperately need to accelerate battery tech!