We went to classes with a Certified Professional Dog Trainer who follows Ian Dunbar's gentle but effective training. It sounds like you are getting great socialization for your puppy, but need a more structured trainer. Classes started with 10 - 17 weeks old for puppies. We're not in the area, but look for a trainer with CPDT - KA.
Ian Dunbar has a book called Before and After You Get Your Puppy that is so helpful to understand shaping dog's behaviour from a very young age.
https://www.youtube.com/watch?v=fbdDm5MmkAs
He has many training videos on youtube and a website, Dogstardaily.com
Don't wait! It's best to start training puppies while they are young - 17 weeks is getting old already! By 7 months, they have a teenage attitude and you have to keep up with training, or they can rebel.