You got some GREAT advice here and it seems to be working. Cats do not take well to change. Like Cataholic said, with all the changes that were made, it's no wonder he was confused!!
Two suggestions for the odor. Nature's Remedy is wonderful at getting out urine odors. My cat (RB, Casey) had at UTI and proceeded to let me know by peeing on my mattress. I bought the Nature's Remedy and literally soaked the spot with it (it was a soft side water bed). When the stuff dried, the odor was gone.
Another product that I absolutely SWEAR by is Nok-Out. You can order it online. I always buy as gallon of it. It literally wipes out any odor there is. It has no scent to it so it's not like Glade where is masks the odor. It totally eliminates it. I use it for my cat bedding and spray it full strength in the air when I clean the cat boxes.
I'll keep my fingers crossed for you. And like everyone says, PLEASE, PLEASE don't yell, hit or rub your cats nose in it for something that isn't his fault.
Bookmarks