The Situation: 360 Water pump

Or just buy a radiator. That will solve the mechanical plus lessen the chances of overheating.