Jon, I believe you are correct, you must run the ground to within 5 feet of water line point of entry, or you could run it into the panels ground bar. This or may not be accepted where you are. Here in Mass we are not allowed to do this. They have deleted 250.130(C)