I am in over my head on this...

If I understand your question, I think the system might be bonded correctly according to the CSST Man. instructions. One thing to consider though is what brand of CSST is in use.

The water pipe would need to be bonded to the foundation steel, driven ground rod, etc. but tht is seperate from the CSST issue.
One other thing to look at, Is the metal fireplace flue bonded? I think the wording in the code calls for all metal compenents that are likely to become energized to be bonded. It is seldom done here, but picture a lightning strike on the chimney that goes down to the fireplace and CSST connection and back to the iron pipe entrance. The CSST is the weak link.
I think the main reason for the CSST problems is the thin walled tubing will not handle the lightning surge and it becomes the weak link.
A bonding wire and jumper may be desirable at the fireplace cabinet and CSST outlet with the bonding going back to the equipment grounding electrode system.

Anyone else have any thoughts on this?

__________________
Jim Luttrall
Mr. Inspector.net, Inc.
Allen, Texas 75002