Henwen, I wouldn't discount a third party. The actions, including the prior EA are consistent.

I would redo the room. How about giving him a consequence to his actions that has an upside for you either way.