Good progress.
Before buying a new matrix, whip the pipes off it, attach a hose pipe to it and let the water pressure do some work. Did this with my old GSi after it got colder and colder, the amount of gunk that came out was shocking and after that, nice and toasty heat!