Yes do that....
but what you should also do...is when you go get the pup..take a separate blanket and rub the pup's mum's scent on it and then when you put the puppy in his crate or pen, if you do decide to crate train him, put that blanket in there. Hopefully it will help him settle at night.
Cheeko sounds quite smart, not likiing rude dog owners lol
