You're right but the problem is subsidies change that math. If the US gov subsidizes oil, then the economics of that work out even if solar wins in a free market.
Subsidies can certainly delay things at this point, but it's hard to see how it'd stop it.
Considering we are racing against CO2 release and the warming planet, I worry that the delay makes a large difference in outcome, not for energy breakdown, but in quality of life for humanity.