If a motor runs warm while idleing or slow speed (under 35mph) it is a fan/ shroud problem. If a motor runs warm at speeds above 35mpg and has a steady rise in temp then the radiator is too small. I would say that you need a bigger radiator being you cooling problem is more speed related. Granted if your motor was running on the lean side it would build heat easier but if it runs good and doesn't surge then that is not the issue.
Chuck