I would be ok with this. So would the moves that you don't need to select a source from be Water Manip, Torrent, Ice Spike, Ice Blast (only when there's ice around), Water Spout (the water wave part of it), and Octopus Form? Also, maybe to keep people happy, and prevent too many rapid attacks...