I would do the test Albin has linked too also make sure heater core flows good.

I had one several years ago that kicked my butt the story goes like this {short version} lady driving water pump goes out shredding aluminum through out cooling system she stops ... Login to read more.