I’m with you on not swapping stuff just for the sake of it. I do a yearly “exercise” on all the valves—main, under sinks, behind toilets, laundry, etc...

- Flushing definitely helps, but if you’re still hearing that “popcorn” noise, there’s probably some scale caked on the elements or bottom of the tank...