Everybody has ignored the part of the OP where it talked about bonding pipes to a nearby subpanel. That part is wrong. Just bond the pipes to each other, not to the subpanel.
As far as what the rest of ya'll are debating, recall that the code requires bonding gas and water piping systems. Doing so at the water heater (where all the typical pipes are usually present) is seen by most inspectors I've dealt with as an easy way to do this, although it's not the only way. If you want to argue that gas is bonded at appliances, well, I'd say the onus would be on you to prove it in any given case.