One potential solution is grid-scale liquid metal batteries:

http://lmbcorporation.com/

http://www.ted.com/talks/donald_sadoway_the_missing_link_to_...