Fix seemed to be a whole-house water filter. It's changed annually,
and there's a whole lot of gritty crud in there afterwards!

Sounds good advice.

I've got the Honeywell valve laying around waiting for me to fit.

Honeywell kit is well regarded and well made. It would be the one I
would have chosen anyway, but mine came bundled with my thermal store.