The real problem with your analysis is you want far less energy storage than that. A reasonable goal for vary high levels of 'green' tech is ~1% or ~15 minutes of grid energy storage. Beyond that it's much more valuable to simply build some peaking power plants and have excess capacity.
