Poway water system to be overhauled