IMO the ideal would be that to be part of a society in the first place, the person must consent, and if they no longer consent, they can immediately leave and find a different one. This means that if they receive one of those "psychology rewrites" you mentioned, it's only because they consented to the rules of the society enforcing that in the first place, prior to punitive action. Whatever society they choose can have whatever form of punishment or rehabilitation they actually want, and it will be ethical because they chose to live in that society.