Battery overcharge change?

I was thinking what if the battery overcharge was changed so that it can recharge energy on protoss units and buildings for a short time? Currently I feel like the current battery overcharge is really boring and doesnt offer a lot of potential options for defense. Things like the oracle, sentries, shield battery and high templar would really benefit having extra energy to defend outlying bases.

Sorry imho it would be op. Very much op. And im Protoss:)