Yes, Supplementary bonding on the bolier, which is cross bonding between all the pipes, this must be unbroken, best way is to remove a section of PVC, say 1 inch or so, then hook this around behind the washer on the earth clamps.
hope this helps, seems like you have it well figured out tho...