Yea, I would replace the water pump. The top hose is getting hot just by heat transfer. If they both dont get hot after the thermostat opens, then the pump is bad. Are you sure you removed all the air from the system as well?