^While it is true that past games have not been completely successful in keeping water routes diverse, that's something that should be maximized as much as possible. At any rate, it doesn't really do you much good to have all 4. I think the best way to handle it would be to get rid of the Rippling Water, since that and the rest of the phenomena aren't really adding much to the distribution (it only serves to make rare Pokemon more rare, and to allow you to catch certain evolved species of Pokemon that probably shouldn't even be catchable). Then we can have Fishing early on, Surfing about midway through the game as always, and then the Super Rod can be post game for National Dex Water types just like it was in DPPt, BW1, and BW2. And maybe Diving as well late game.