Looks like you might have assumed a tax credit on the solar to get the payback, or maybe the costs have come down, or maybe competing rates are higher now.
As for the hydro to convert solar to baseload, no its not very efficient, but its cheap, especially compared to fuel cells, I'd think...