I would call another electrical contractor (licensed, insured, bonded, the bigger the company the better...) for a second opinion.
Maybe even call a third.
Bonding the water lines is a "bandaid" that can be used for a
very temporary "fix" but this does not seem to be the case in your situation. It will not cure the problem. It will
not turn a non-GFCI circuit into a GFCI circuit. His "fix" may have even turned a potential electrocution hazard into an electrocution
and fire hazard.
This is a very dangerous situation and cannot be cured through online help.
Please get a
very professional (cost no object) additional opinion(s).
In sincerety,
-Virgil
[This message has been edited by sparky66wv (edited 09-15-2002).]