I understand your point, but I feel what'll happen is players will start mastering the WaterCombo, get really excited using it or just find it so darn effective that they'll start using all the time. Since FrostSwift is planned to have a 5 second cooldown, by the time the waterbenders uses the ability it will last longer than WaterWave because it is more effective, and then by the time it is finished it will be ready to use again (almost) instantly. If you were to include a partially shorter cooldown it would be ready pretty much instantly and would seemingly have no cooldown, when it's just so tiny it's not noticeable, which means it's not really doing a good job of acting as a balance tool. Either way, with partially shorter cooldown or common cooldown it will be so small that they won't even be noticed, and such an effective ability like this could just be spammed. Waterbenders will most likely be whizzing around everywhere.
I agree with you on your other point though, WaterWave should definitely be included in the WaterCombo - it just makes sense.