"You're grounding to the water system, not the pipe...

No, you are grounding the water system.

The wire is there to bond the copper system in the house to the service ground, not to provide a ground for the service as would be the case if there were a metallic water supply line.

And you need another ground rod. [Linked Image]

-Hal