I will second the outside coop. Unfortunately until then, you might just have to take up all pointy objects and make sure all cords are put away so no suicide/homicide attempts are made. If corner timeout doesn't work, maybe try taking away his TV time. They hate that.
:gig