The thing about 19 turn class where I run at is no one cares about how hot the motor gets..
(I cared but got tired of getting smoked..
) Your gearing is close, Your at a 6.11 final right now, I would try a 38 or 39 but a 39 puts you at 5.79..It will get hot, but you should have the Top end you want..plan on replacing your brushes often.