I'm sorry but I don't think of 20.5 miles as slow. I struggle to get myself up to 16-18 mph on most rides, even though I train well and work hard. There's only so much an aging body can do and at least you have youth as a relatrive advantage. As to the new bike, you need to listen to others for fit, components etc. Good luck with it all.
marni