I would also suggest running a lighter prop.

Pick up some 7.4x7.5 and 7.4x7.6 props and get it up to 23,000 rpm. The motor just isn't as happy under that.

Or, if your not racing it, "Deflash" it untill it turns 23k by sanding the TE down about 1/30".