Mike,

Section 250-81(a) requires another conductor, as well as the water pipe.
Since you'll need to install this conductor anyway, why not just pound in
the appropriate number of grounding rods and forget about the water pipe?

Dave M.