And if you use a methan fuel cell - you can use its surplus heat for heating while generating electricity.
I don't think they are market ready, though. But there are lots of options out there and the best solution is likely to combine what works now.
Btw. I think there was a breakthrough with natrium based batteries. (No lithium needed). They were just not as energy dense as lithium based ones, but that matters not so much for stationary use. So with no ressource limitation, you could produce them in very big quantities..