How about effects trigger on both gaining and releasing charges and double all the elemental damage numbers. Just a slight modification of the skills that’s easy to do and easy to balance without having to introduce new mechanics could end up game breaking. Playable without being broken.