It sounds as if your CL dealer is the equivalent of the local bike shop--you are lucky to have him around.
Yes, clipless pedals and some good shoes would be the next logical upgrade for you, and will probably have the effect of increasing your speed (although you are certain to fall over at least once!) .
East Hill
__________________
___________________________________________________
TRY EMPATHY & HAVE LOVE IN YOUR HEART, PERHAPS I'LL SEE YOU ON THE ROAD...