My 1989 25 horse tohatsu ran hot then after that it had a tough time idling. I removed the head and noticed a broken ring around the head gasket. The pistons and the cylinder walls look good and there are no obstructions in the water passages. Would a new head gasket and water pump fix the problem?