OK.. But he NEC allows that CW bond to be beyond the 5' if they customer is not going to install a transformer and tie GEC to the CW. Case in point, just like an earlier post that bonded the CW within the hot water heater closet. You can still do that in a non-commercial, non-industrial application.
I understand the concept of re-piping, I guess that having the first 5' covered is the intent of the code?