Louis you are doing great. Still working so you are building your foundation. Not sure how long you have been riding but most people our age need three years to reach a very strong level. Of course depends on shape, strength and number of miles ridden.
i rode a hybrid for three years before getting a road bike and have more work to do. Can't keep up with a riding club but getting there. They do 18-25 generally. Today averaged about 18 into the wind with them for 14 miles. Will get dropped for a while but beginning to see the light.
Anyways keep riding, build your core, get a fitting and ride some more. Great sense of achievement huh?