Hydro is cheaper, if you have access to it. That (and cooling) is why many data centers are built next to rivers like The Dalles.

But your point otherwise stands; solar + battery is cheaper than any fossil fuel form of power.