I'm not a raider, but do you have the companions relocation AA? I would imagine this would solve a lot of your water pet positioning woes so you can max that DPS. I find even just for grouping or soloing it's terribly useful and definitely worth the AA investment. I did NOT have it because I couldn...

Raiders-do you use air or water as your "normal" pet on raids? Or do you use air on trash and bring up water on bosses? I know water parses higher when you get the positioning correctly, but it's always such a pain in the butt to do that positioning, especially on a lot of trash...