imo, there should be pump, pipe, treatment and water stations/towers.
i would rather the "water radius" be very large and come only off water stations; like the reservoir in Caesar!
the reason is to not crowd the map with water structures but to have a few which would do wonders to the look and feel,
a farm house with a water tower etc, in the city, a small substation that pump water to all buildings...
also how can you be a city planners if you don't have NIMBY buildings?