Two more things: Max preferred to sleep in his doggy bed in his xpen his whole first year. Now he sleeps curled up against me. See how things can change?
Grooming: work with your puppy daily to accept being touched from ear to paw for grooming. Be calm, confident, and patient. Praise and reward when he doesn't resist as much. I tied grooming to going for walks, which was Max's favorite thing in the world. He knew he had to comb his hair and put in his topknot if he wanted to go for a walk.
More on body touching: Teddy did not like to be touched when he was lying down, resting or sleeping. He would get up and move away. Now he loves it! He will even turn over for belly rubs. I will admit that it took him a couple years to change in that regard.