All I can offer to suggest now is, to keep your sanity, can he stay in one room with a litter box, water dish, toys, while you are at work? That way at least you don't have to look all over the house to clean up.

Maybe others will have more ideas.