Yes, change your waterpump, don't run the engine too much till then. Try to get a white plastic or metal impeller on the replacement. Make sure the cooling fan runs (I imagine it was roaring away after your 20 minute drive!)