Poor Cali.. I would say you just need to seperate the two.. Put him in a spare bedroom with double up top each other baby half doors so he can not jump out.. Make this his room with food, water & litter.. Sounds like this is the only way to get this stoped.. Good Luck