Take a look at an addon called smartbuff (for buffing) and pallypower (also for buffing, but on the paladin) - that should resolve your buffing issues. You should _not_ have water shield in your dps rotation. Ever. But a hotkey for the buff trigger on a seperate key and get used to spamming it between combat.