Matt, I think you need to look up the difference between grounding the water piping against becoming accidentally energized and using a metal water pipe feed AS A PART OF YOUR GROUNDING ELECTRODE SYSTEM.
As you can see from my posts, I am no code whiz, but am enjoying the learning process going on here.
With some of the commercial buildings (malls) I am working on it seems like sometimes I can build my whole service in less time than I can figure out and install the proper grounding---sprinkler, water, bldg steel---which may involve running to the high up steel above, getting out thru the masonry to grd rods, etc.