In NZ we're discussing pumped hydro in Lake Onslow which will provides months of backup for the country
LiFePO4 works to demand shift on a daily cycle just fine and scales better to solar input (where you need much higher power handling so you can charge it on limited sunlight - a pumped hydro system is limited to charging at about half its discharge rate).