Nuclear corrections to molecular properties. V. Refinements in ab initio normal-coordinate potential energy and property surfaces for water and their effect on the vibrational analysis