The water bond and using the water pipe as a grounding electrode are two different issues. If your able to use the water pipe as a grounding electrode, then yes the connection is required to be within 5ft of where it enters the building and it must be supplemented with at least one additional ground rod. The 5 ft rule is good practice even if the cold water is not used as a gronding electrode. This way if a water pipe is cut or removed you do not lose your water bond and possibly grounding electrode.
