I work at a Chevrolet Dealership and I would say to get the water pump replaced. It is easier to do it now. this way you will not have to make two trues and you will save a bunch on labor costs. You will not have to pay twice for the work. Just once and parts.