Whatever 1.0 intended, I much prefer the current elemental split between BLM and WHM.
There are three clearly destructive energy, and three that are essentially the manipulation of natural matter.

As for water, I've always felt that the Medica spells, or all of the HoTs for that matter, could have been tied to water.