All looks good. You could also reduce water usage by promoting/part funding the installation of "grey water" havesting systems in homes for use in toilets and similar. This would also help to reduce demand on older surface water drainage systems which can struggle in heavy rain in built up areas.