I tend to disagree with the handbook drawing in this instance. The last sentance of 250.53(D)(2) states that a supplemental electrode must be bonded to: 1) The GEC, 2) The service nuetral, 3) The service conduit, or 4) A grounded service enclosure.
One of the electrodes in the handbook drawing MUST be called a supplement, and bonding the supplemntal electrode to the water pipe is not one of the 4 options listed above, as per 250.53(D)(2).