Storage being what it is, we either accept the costs of routine (10 year cycle) swap outs or we dont. Simple. Oh, and please remember that present demand will be a fraction of future demand and hence any storage you build must grow in capacity over time.
Photovoltaics serve a very specific use case of aiding domestic energy production at times when conditions are right. They are great for a lot of reasons, but for cases where there is a high demand for reliable supply such as industries producing things, they are . . not the first choice.
Given the equivalent amount of dollars spent by an entity as large as the state of California, with the laws of physics as we know them today, there is only one logical solution in Nuclear energy. The energy density and scale just can not be beaten.