another one is potassium, and giving that the future is metal-air batteries, potassium works great there (its oxide seems to behave better for recharging in that scheme than lithium's)

Wrt. possible short-term lithium supply issues, i can see how Musk would just build a new mine operation if necessary, like a Giga-ship to mine it from seawater :)