for what it costs.. Id swap water pump anyway... then flush the pipes out with a garden hose in both directions.

hope you sort it matey