I agree they must be taken into account, but the obvious counter is to take the cost of energy storage into account for solar/wind, which currently weakens its position significantly.

Long term that cost will go down, but it's always going to make the calculation much less simple than it seems at first glance, solar might be the cheapest form of power at the moment, but it's not the cheapest single source to run an electricity grid by a wide margin.