Your estimation goes way off because you still believe lithium ion to be the only viable solution. By now Sodium-Ion batteries are already installed even in EVs and can be produced without any critical resource like lithium.
And then of course there are all the other storage solution. Like I said, there even are storage solutions like concrete balls. Successfully tested in 2016, here an article from 2013.
By now it wouldn’t be wise to stifle this enormous emerging market of various technologies by using expensive, problematic technology (not just because the biggest producer of fuel rods is Russia).