You sound much more consistent with your training than I, so this may not be relevant to you.
I haven't worked with my bubs training wise, for many months and wanted to get back into it with Syrus while Sophie was rehabing again. I enrolled in a repeater clicker class to kind of pick up where I left off.
The class is full of 5-6 month puppies right out of puppy school. They ran rings around 16 month Syrus. In other words, I felt completely in the wrong class. It was like Syrus had never been in a class at all. Being a newf he wasn't unruly, but sure seemed like he had forgotten EVERYTHING.
Oh, I do have a point.
I'd continue with non-stop training.