Water pipe as an earth ground has long since been insufficient. Water pipe earth ground is the only electrode (defined by NEC) that cannot exist without some other earth ground.

Grandfathering means other missing earth grounds are not required to be installed. But informed homeowners upgrade that earthing anyway. Especially since the upgrade is so inexpensive and easy.

A bypass ground wire is required where a plumbing change (ie water meter) might put a plumber at risk.

Furthermore, a ground connection to cold water pipes should be located within inches of where that cold water pipe enters a building. Meaning that water softener should never have been between an electric breaker box and earth.

Best, at minimum, is to reroute that breaker box ground wire to where a cold water pipe first enters building. Also install that bypass at the water softener. Install a similar bypass between hot and cold water pipes to a hot water heater. And most important, connect a main breaker box directly to a copper clad ground rod located outside nearest that breaker box.

That above paragraph defines human safety. Connect hardwire ground from TV cable, from telephone NID surge protector, from satellite dish cable, from OTA antenna, etc directly to that dedicated earthing electrode. As required for appliance safety.

All parts are routinely found in big box hardware store because any informed layman can to it. And because it is easy.