I don’t know if storage is more efficient at point of consumption or point of generation

Some time in the recent past or very near future, an incremental addition of capacity became more resource intensive than incremental new generation and battery.

So the ideal is actually have both, because this