Personally I don't going into competition with laptops, mobile phones and car battery manufacturers as a viable long term strategy for grid scale storage.
Any electric car plugged in is a great buffer for surplus electricity production.
Taking the number above for installed capacity of pumped hydro. You are looking at nearly half a million cars and homes to match the capacity (assuming 50kwh per vehicle), before considering the plugged in factor.
At say a nice round £1000 to upgrade each home you are already looking at a cool half a billion. Already around the cost of the Dinorwig pumped hydro station before you figure out how to compensate electric car owners for the extra wear on their batteries or the fact that when they leave for work their car is flat because it has been powering your neighbors electric showers.