I have no idea what you like, so I have no idea which you'd like better.
I can tell you this much (and overall, it seems that most DISers feel this way) ... In my opinion, paying for water view at any of the 4 WDW Moderate resorts isn't worth the money.
I don't want to compare the resorts to a motel, but they are built in that very general style, meaning that your door and window(s) open onto exterior corridors. Therefore, in between you and anything you have a view of, is the walkway where people walk to get to and from their rooms. In other words, if you have your curtains wide open to enjoy the view, then everyone walking by has a great view of YOU! That being said, there is a vocal minority who LOVE water view rooms at CBR the other Mods.
If you decide to switch to a preferred location room, do it ASAP ... those rooms can sell out during busier times.