Switching enclosures sounds like a good move for now. I'd clean and disinfect both cages together and make it an easy swap.