Aluminium Ion batteries are very close now, should be in production by end of year. But Covid has changed a lot of dates....
Al-ion is safe, you can swallow them!, they won't catch on fire, they hold more charge and allow for more recharges than li-ion by several factors.
It may be worthwhile just getting by on what you need and wait for way better safer tech later this year/early next.
MG
https://www.forbes.com/sites/michael...h=85ba11a12ebd
I think I read somewhere is was car batteries and the penny batteries. The other batteries will follow along after them...