Best suggestion is to take all the aerators and showerheads off and run all faucets, including boiler drain and outside hose bibbs to clear the lines.
They will eventually clear out; it will just be a matter of time before it quits.
Replacing the water heater probably wouldn’t speed up the process.
