For non-mobile energy storage, I have my hopes on sodium or even saltwater batteries. They are less energy-dense than lithium-based batteries, but they have a longer lifetime, require less maintenance and you avoid the risk of a lithium fire.