I would hide the toy Iβve heard that it can remind them of their actions.
About the litter box I would discourage hooded litter-box,
it doesβnt allow proper air flow, and has the possibility of making them feel trapped.
Does he have a hidey (2 holes) he may be trying to dig a hidey
(Tunnels...