Welcome to YT!!
Puppy coats can be fun. Sometimes the puppy coat and adult coat will mat where they meet and this could be contributing to your problem. You can try using some spray on oils to help ease the transition of hair to the adult coat and it will add some shine and silkiness to the hair.
There is actually a brand called Plush Puppy from Australia that works pretty well called Seabreeze oil. A lot of show people use it on their show dogs when they wrap coat but used in small quantities should help your pup.
Congrats on your little one!