I would ditch Shiva since you are using phoenix. And if your weapon grid is focused on light then it's only more reason to ditch her.
I have 3 water hime's plus Satan, main weapon is also water. SR himes hit about twice as hard as Satan. But then again, she only is there to give that defense debuff.
Oh, I forgot to say that I am using fafnir that gives +40% water dmg. And my weapon grid is all about water.