Pat, that's a nice looking commuter set-up!
I feel compelled to express my perspective FWIW: 28-30 mph, or even your current avg. speed seem like an unreasonable expectation for a 20 to 25 mile commute.
As a 245 pound cyclist, that speed average over any significant distance is an impossible...