Can we stop with this? It's not a helpful line of thinking or a useful argument. This is the batman vs. superman argument of children at a comic convention. Arguing whether federal highway funding factors in to the cost of coal is absurdly useless.
"I wonder how good it could be"
It's already here, solar is already dramatically cheaper and has none of the risk profile a global energy market produces. You install solar and you have that energy for decades.
Solar is here and its cheaper, batteries are good enough for utility scale. Now its simply an adoption curve.
Moralizing or bringing up silly arguments about how cost ought to be accounted should be considered harmful to the progress away from fossil fuels. Unless it's your intent to start pointless arguments.
It doesn't seem like a silly argument to me, and certainly not moralizing. Rather "I wonder..." seems to be an indirectly phrased request for information, an open invitation for somebody who has seen the numbers to provide a link.
But I do think I get your point - the subsidies are there so we should compare the costs as they are.