From the CalISO graphs, there doesn't seem to be a shortage of solar power for most of the day. It doesn't seem reasonable to incentivise production in the same way as it was when that wasn't the case.

I think NEM 3.0 incentivises storage now? Which seems to be what the (California) grid is looking for.