Water hybrid mode

This hybrid mode (average + shallow) averages the waterways while still allowing the water to flow over land surfaces. Can be very useful in use cases where slightly larger grid cells are used for rain showers in urban areas.