You raise several interesting points for what might be in store for Water in the future. I also happen to agree that a Close Range water theme makes sense both conceptually (waves of water) and thematically.

!1UP