Yes but this assumes infinite availability of the resources required for battery production. Given they are in Africa and Asia, this is gonna be way more difficult in the rising new world order with the shrinking influence of the US and EU as the Pax Americana is dying a slow death.
BRICS nations and friends will make the near future very uncomfortable for Westerners used to affluence.
Out of the world's five largest lithium producing countries, the largest one by far is Australia, only China is in Asia, and half the world's reserves are in South America anyway.
The US will simply do whatever it always did and, should the need arise, simply putsch away whoever governs these reserves.
30TWh/year in 2031 is not infinite, and is in fact quite finite...
Also, essential minerals are alllllll over, only some (cobalt nickel) are concentrated in a few areas and those are actively being minimized and eliminated from future chemistries.
BRICS nations and friends will make the near future very uncomfortable for Westerners used to affluence.