We got there in the end!
Yes, my bathroom has hot/cold taps and heating, and all plumbing is copper and is connected electrically. :)
No, supplementary bonding probably isn't needed. The CH/HW don't connect to planet earth (run through the floor-ceiling void, not buried in the concrete...