You're rehab solutions sound like a lot of trouble for a bunch of mad dogs, honey. If they're dumb enough to commit heinous acts and then get caught, I think we should just lock 'em up forever or kill 'em. Seriously, why bother helping the low functioning ones?
People who are incarcerated have a negative effect on the economy. People who are dead have no effect on the economy, although the death penalty is quite an expensive sentence. People who are rehabilitated and functional members of society have a positive effect on the economy, and can have a positive effect on society itself. Mark Wahlberg is a great example of an ex-criminal turned productive member of society.
Not only is rehabilitation sensible for society, it is also the most pragmatic solution to the problem of criminal sociopaths/psychopaths. Pushing legislature for condemning people to life sentences or capital punishment for having a psychopathic personality disorder diagnosis will not be effective, given the current ethical landscape. The death penalty in itself is controversial. A PPD diagnosis is not going to prevent those diagnosed from being released, so the most logical approach would be to minimize as best as possible the damage caused after reintegration.