Jack: On gear ratios: For maybe 6 years, I ran a TZ700 sleeved down to 500cc. That bike was the epitome of a peaky power curve. In those six years, I NEVER got two back-to-back runs at peak RPM with optimum gearing. The power band was just too narrow.
I just decided that if I had a slight (2-3 mph) tail wind, I could run my best speed. If the tail wind turned into a head wind for return runs, I just left it in 5th gear, and hoped for the best.
I your case, if there is not an optimum set of ratios available for high and next-to-high, you could think about, say, 4th and 5th if they are closer. Just need a faster push off.