Yup no reason to disagree with these numbers over the long term, I would add Wind in too. However wind isn't an industry where China has cornered the market, Vestas, GE, Siemens Gamesa are all quite competitive as well.
Offshore wind is not yet competitive, plus the number of suitable locations on the Chinese coast is limited. So I don't see it becoming a trillion RMB industry.
Onshore wind is already cost-competitive, but suffers from the same problem of limited operating locations which are also far away from end demand.
But with solar, you can do smaller-scale installations. Yes, this works out as more expensive, but you can bypass all the grid costs and avoid the costs of upgrading the power grid to handle all the EVs that are coming. In the UK for example, if all cars are electric, it will roughly double electricity demand.
I'm actually surprised you haven't brought up hydrogen because of how important it is to enable transportation via ammonia. I've met some Korean hydrogen players and they clearly stated that they believe the industry could be the "next semiconductor industry". Too early to tell when electrolysers and fuel cells become cost efficient though.
I just don't see enough opportunity for electrolysers and fuel cells to become more efficient, because these are essentially mechanical processes. Physics and chemical reactions place hard limitations on how much these can improve. You use electricity to split water into the components of hydrogen and oxygen. You compress it, transport it, then "burn" it in a fuel cell or engine to produce heat. So you can see how there is comparatively little room for improvement.
You have a similar thing with Ammonia, which is produced by industrial processes.
In comparison, solar panels are a type of silicon semiconductor, and there are many possible combinations of materials and design improvements (down to the atomic level) still to be tried out or implemented.
---
Then you need batteries to store this intermittent electricity.
A similar situation exists with battery technology in terms of materials and design. Lithium too expensive? No problem, Sodium is available. How do we stop dendrites growing an atomic level which reduces the lifespan and charging speed of a battery? Dope with different elements or change the atomic thickness of various battery layers. How do we redesign the battery to ensure the Electro-magnetic flux (the electromagnetic field lines) transfer energy more efficiently inside the battery? It's not actually the electrons that transfer energy.
You can see there are so many more possibilities available to improve or drive down cost.
---
So the rate of possible improvements with solar and batteries is much greater than with Hydrogen/Ammonia.
Plus solar and batteries are already competitive and deployed at scale, which further amplifies their advantage.