I disagree. Thermal collectors are 3-4x more efficient than pv. A result dictated by physics. And once the general price of energy goes up their break even point will come much closer for many many applications. Add to the that technological developments happening in that field like vacuum solar panels, thermal batteries (salt hydrates) and the Chinese thermoacoustic generator I'd say we are only at the beginning.

As for wind, that too is getting radically more efficient. Take for example Kitemill https://www.kitemill.com : 90% material use reduction and 6 fold price to performance ratio compared to the traditional cumbersome solutions. My guess is that this design is going to be the new standard. The Henry Ford of wind mills, making wind energy far more accessible too many communities all over the world.

So yes, I agree that wind and solar can and will rule:)