I know, I know, I ask lots of questions.....sorry, but thanks!
Let's just end with this, I will buy a new length of #4 wire and run it to within 5' of where the water line enters the house. This will come straight from my panel. I will then bond the gas line where it enters the house with the existing #4 wire, even though it's not code where I live. I have the wire and it sounds like you think that is the best thing to do.
If I am correct a simple Yes will suffice, or I'm likely to ask more questions!!