I have the same problem with Riley!! He is now 1-year old.
I have never had a problem with him smelling though.
He Always smells really good.... Sometimes when I am cuddling with him or giving him hugs and smooches and I just breathing in cause he always smells so good!