i'm having the same problem with my pup of the same age and i'm doing the same as you! sorry i can' t be any help, but hopefully others will have some good suggestions!