I quite like the idea, although I feel like removing FastSwim would be too harsh.
If that was to happen, a waterbender as a firebender, per example, would have the same mobility underwater, which isn't - or shouldn't be - desirable, since waterbenders would be moving in their own element. The...