Welcome to the "hydro" club! Sorry to hear about that. Same thing happened to me last month, but I already had a h22 in the plans so it was like a reason to do it now.

Anyway I'm not much for bypass valves either.