Storage has nothing viable on the horizon, let alone in production. I will agree it's less risky--because risk is an unknown and thus a certain failure isn't a risk.
What storage are you talking about? We use batteries for very small scale storage, just long enough to spin up something better. To actually store power for night is several times as expensive as the power in the first place.