Just stay with all stock parts for an engine like that. Stock water pump, 26 inch radiator, shroud, clutch fan, etc. Run the highest drive ratio pulley set that you can find so you're spinning the water pump fast and you should be fine.