Yup, the prop sounds too big. A prop that's too big can overload the engine and cause it to overheat. A .21 would use a Prather 220 or 225. A .18 should definitely step down a notch. I haven't run this boat, so I can only estimate that something like a Prather 215 would be a good starting point. Perhaps the Grim 40x53?