Hello HauntedVertigo,
Assuming the property is in the United States and Under NFPA-70:
Two grounding electrodes, spaced a minimum of 6 feet apart and served by an unbroken conductor are usually required. They can be plate, rod, pipe or other approved electrodes. All service grounds are to bond at a common point.
The neutral bus will be fine for your existing installation.
Note, however, that this use of the neutral ONLY applies if it is in the same enclosure as the first disconnecting means. If there is a main circuit breaker, fuses or a switch "upstream", using the neutral as described in #1 is not allowed.
We don't get to use the water piping as the supplemental electrode because often hidden are lengths of PVC or PEX or other non-conductive piping which interrupt the electrons' low impedance path to earth. Thus, two rods became required.
I hope this helps and doesn't confuse!
Paul