Solar is not (yet) economical for reliable, year-round electricity because of storage costs. China coal use is growing again this year.
There is also no default price on energy markets, it fluctuates with supply and demand. Dynamic pricing by itself is enough of a reason for industrial users to build up their own power storage, which allows them to time-shift consumption from the grid.
Time-shifting is definitely going to increase, but it's not a bad thing. Look at how battery storage has made electricity cheaper and more reliable in California.