I was under the impression that any SUB which is not within the same dwelling as the main/entrance will require it's own grounding electrode (if in the same dwelling, 4 wire feeder is "now required" and has always been preferred).
?
if OP connects his ground to his water pipe, it's still only...