While you still have the clutch cover in the mill, you might want to consider removing about .030 off the water pump face.
As you can see in the pic below, there is a lot of clearance between the water pump and the impeller.
This will cause cavitation and potential air bubbles..