Inteligent Waterspout AI

I want to suggest adding a more intelligent AI for skills like waterspout (i dont know if theres other skill like it yet) that rely on the damage recieved in the same round by direct attacks, at please in ladder and fortune race battles. Every time my cygness tries to use waterspout even though its speed is higher than the oponents makes my fingers itch to teach it a different spell.
I grant that a meniss using cunning is something this AI wouldnt need to take into consideration, since it cant be predicted beforehand which skill the oponent would chose, but in fights against monsters with lower speed, dont even bother with waterspout

Easier said than done but I agree. That's why I replaced waterspout on my cygnets with water torrent.