Surge may mean lean and lean is hot. Timing may not be helping either. First step is to get the timing right. Next step is to get the carb/mixture right. I'd find a shop that can help get those dialed in first. It would be money well spent to protect your new engine.

After that, focus on the cooling system.