The other thing is we're innovating in battery chemistry. It would not surprise me if Lithium were only one of many options in ten years, depending on the storage capacity and number of cycles needed per kg. Sodium is a likely candidate, and it's as cheap and available as salt. Iron, aluminum, and others are a possibility, for stationary batteries where weight doesn't matter.
I know people here are very skeptical of every battery advance press release, and rightfully so. But nonetheless, some of that is going to pan out, and the world of energy storage is going to fundamentally change the economics for cars, airplanes, and grid storage within the next decade.