Your solutions seem reasonable. I'd also add therapy to help the guy grow up a bit so that once he got out, he would be able to manage his anger without getting himself back in.

When I was a child listening to RMT, I used to thrill every time I heard the name Fred Gwynne. Wow, I would think, Herman Munster on the radio! (I never saw Car 54, Where Are You?.)