I have a cunning plan - I wonder if the GW team could split up the elementalist profession into four different ones: Pyromancer, Areomancer, Georamncer and Hydromancer: and the original atrributes water magic, fire magic etc. could also split so like with eath: tectonic magic, etc. or air: wind, lighting, light etc.
not sure but this could work.

of course they would all have energy storage
or to make it so things that boost energy storage or requier energy storage you could say water storage, firse storage etc.