So when I go to 40 series and maybe 6S, should I drop to 18 pinion?
What's stock pinion, 20T? I'd use BrianG's calculator and set a target speed of 35-40 MPH and measure your temps often. If your temps look OK then you can bump the pinion up a little.
All I ever wanted was an honest weeks pay for an honest days work.