Water System Improvement Program, Harry Tracy Water Treatment Plant, Long-Term Improvements