If you want to use heat for storage liquid metal batteries might be better. (?)(Ambri) From what I understand they have ~80% round-trip efficiency, functionally unlimited lifespan and no moving parts required. Electrons in/Electrons out.