If it's coming off the track at 120 to 130F, then go up a tooth. You've got another 50 degrees to play with before it thermals.
Ollie, I don't know how you can say that the Nosram/LRP stuff is BETTER than the Novaks. EVERY Reedy Star motor I've seen has blown the rotor apart inside the can. But on the Novak, I don't know anyone personally that has had any problem with them.