OVERHEATING

Any thoughts about cavitation......switching to the six vane AC water pump
No way on switching from 8 to 6. If your current pump does not have the anti-cavitation plate, and originality is a concern (I assume as you had it rebuilt) I would install a plate on the vanes. Otherwise get a Gates or similar 8 w-plate.