Steve - Look at 250.104(3) The way I read it is that you need to bond the house water piping to the equipment ground of panel you have installed in the house. By doing this you are connecting the piping to the service switch via the equipment ground conductor installed with the feeder. There is no reason to install a separate raceway and grounding electrode conductor from the service switch to the house.
