Bonding of the metal water pipe is mandatory in the code book, both well water or municipal.
Using it as a ground electrode is not mandatory, code simply states it can be used as an electrode, but must be supplemented if used as an electrode.
At least that is the way I read it..
Dnk......