I don't think a 17.5 is likely to overheat from too many RPMs, that seems to be more of an issue with lower wind motors. I've significantly under geared a 17.5 for novice driving without heat issues anyway. At least assuming it doesn't have way too much timing advance.

I think lower gearing (smaller pinion) is a good idea to try. Then perhaps try a little more timing advance.