For WHM, they really shouldn't have deleted Fluid Aura. Simply rework the spell to an oGCD that upgrades to Water III and Water IV, which are spells that already exist in the game. Give it multiple charges too while you are at it. Also, get rid of the Free Cure trait and include a new trait that involves procing Aero II/Dia with Aero III/Tornado. Aero III/Tornado will still be the AoE DoT that everyone remembers, but can only be cast if proc from Aero II/Dia's DoT timer.