That could be the case. But with solar prices consistently dropping every year it should dominate even more in the future. I'm not so sure wind will keep up
I'm confident solar + batteries will solve short term storage. But as far as I know energy density is just not there for seasonal storage. However when energy becomes dirt cheap, chemical storage through Hydrogen or downstream products should become an economic no brainer as well