> That's assuming constant production of batteries at the current scale and production.

That's a terribly pessimistic assumption when production has been scaling exponentially, and cost per kWh dropping exponentially.