Realistically, the gap between 16mph average solo and 21mph average in a group isn't as big as you think it is.
Take the bike you have now, and focus on riding faster. Work on body position. Learn to take advantage of any draft.
There may come a day when you realize the equipment is in fact limiting you. But today is not that day.
__________________
