From my understanding you need to run both a 10mm earth from CU to water stop clock and seperate 10mm to gas, exception being if cable is uncut can link both gas and water together. In a scenario where been asked to change consumer unit but getting to gas pipes of combi boiler is practically impossible what are options. My thinking is that if water pipes tested and proved to be bonded correctly why would it not be feasible to link out water pipes and gas pipes of combi boiler. This then brings all pipework upto to same earth potential no?