i agree with the last few posts dealing with adding the sounds to the water and changing the water routes and encounters...
also may say that if you do change up the encounters for fighting pokemon via fishing/diving that you should keep the birds on the surface at least...
it'd make a lot of sense for birds to be found over the water every once in a while (but not as often as tentacool/magikarp)

and another thing are yall gonna tone down the zubat/geodude encounters in the caves a little???
because those are very definitely annoying especially since you find them more than u find tentacool/magikarp...