Apart from keeping bedroom/lounge door shut im not sure what you can do.You could try a feliway plug in to see if this will settle him.does he use his litter box?also try using simple solution on soiled areas this neautralizes smells,you can get this from petshops,it may be called something else though,basically it contains the bacteria to neautralize smells of wee and poo.