It sounds like the water pump is sucking air. I would take the old water pump and measure it to determine how much to cut off the shaft and also make sure there isn't anything else that will keep you from using the "long shaft" water pump after the shaft is cut off.
I have never heard of a 235 giving any one that much trouble. They are one of the easiest engines to overhaul.
