There shouldn't be a 'shortage' of Lithium for many many years unless for a political upheaval. The key to lithium is that its usage will increase.
Next up will be a intense disposal situation. As of now there is no valid recycling process. When you consider a Tesla 85kw pack weighs around 1200 lbs that's a lot of garbage.