This might work well assuming that the new ‘average price’ is inclusive of a consistency clause which means it has to be able to be provided on demand up to average consumption levels at least. This will as you imply force that average price to include investments into batteries and reversible power stations.