this had some ideas that might be helpful
http://www.spca.org/document.doc?id=116as you say, new baby, only one room in the house, seems classic. they suggest keeping the dog close to you, spending more time together in the room where he's marking....
as for removing stink it would be vinegar in my house.