I am doing an estimate to replace a water heater and a evaporate cooler. The house has a new permitted and passed inspection service panel, 200 amps with the proper electrode system - water pipe and bonded to two rods. The main service has the 200 main disconnect breaker and 100 amps breaker feeding the sub-panel inside the water heater room. In the sub-panel, the EC, separated the neutrals, installed a new bus for the grounds and ran on the wall surface a new wire 6 AWG to the water heater cold water. Really "this hook up" is doing the job, but I don't like this installation and besides, in this area, most of the water pipes - galvanized - had been replaced and for sure this house will follow. I never did this kind of "bonding" installation with the exception of some receptacles. I am wonder if the EI approved this installation. I am been too picky, Do I? Any opinion?