Actually, the next coming MLP movie, which will be in the pony-'verse rather than the EqG-'verse, will feature the sea ponies (or, hippocampus (mythology) - Wikipedia) . So while it is more likely that Princess Twilight Sparkle will be the one transforming her team into aquatic-capable form, the possibility of Discord helping with it is not outside possibility either.