I think you are doing grand! Getting in and out of the city and stop and go does make a huge difference. My group rides and solo rides are 15-17 average
but in my 23 mile triathlon I averaged 18.5 race conditions and no stop and go make a big difference
so if you are averaging 16 at times you are going much faster!!