The fact that you are having a repeated problem like this would make me look at other causes of overheating. Brake drag is something that comes to mind. Are the brake calipers opening fully when you release the brake petal? Good Luck.