Id go to 15, or just try the caps first. I just realized with those batts you arent spinning alot of RPM. With the 16t pinion your at 40 with no ballooning.

You sure you have no drive train drag, or to tight of gear mesh, bad solder joints?

Try the caps, Maybe a fan on the speedo. You should be running nice cool temps