25 mph average is racing speed. Elite type riders not your average, but fit Joe.
I know it is winter, but try to get outside to ride. I would also try to up the mileage a bit more. I ride double what you ride and I am just a slow chick.
To get an idea of where you rank, look at club ride speed categories. This is from the Philadelphia bicycle club.
Class________Difficulty__________________Rate
Class A______Difficult, 45 to 100+ miles____18-20mph average on flat terrain
_____________________________________16-18mph average on rolling/hilly terrain
_____________________________________15-16mph average on very hilly terrain
Class B_______Advanced, 25 to 90 miles___15-18mph average on flat terrain
_____________________________________13-16mph average on rolling/hilly terrain
_____________________________________12-14mph average on very hilly terrain
Class C_______Moderate, 15 to 75 miles___12-15mph average on flat terrain
_____________________________________10-13mph average on rolling/hilly terrain
_____________________________________9-11mph average on very hilly terrain
Class D_______Easy, 10 to 25 miles_______ 8-11mph average on flat terrain
______________________________________4-7mph average on more hilly terrain