I have a simplified suggestion that better reflects the actual costs incurred.
Charge each consumer a value in $/kW of demanded capacity. This reflects what really happens: the value chain of the electricity sector related to renewable sources (hydroelectric, solar, and wind) essentially costs the investment.
1 kW installed from any of these sources requires an investment of around USD 1 000 in generation. And another similar amount in "wire" (infrastructure to connect the source to the utility's power grid).
From a financial point of view, it matters little whether this kW generated 150 kWh of solar, 280 kWh of wind, or 400 kWh of hydroelectric in a month.
Of course, those who chose to contract solar would have less energy available per month for the same investment. But... this is the stark reality! If we migrate to this type of billing, the choice of sources would automatically be governed by cost-based meritocracy, benefiting everyone.