I think having your mind fractured and been forcibly turned into a 'woman' as a deterrent to future whistleblowers is a living hell, that's a lifetime of punishment even when he's out of jail.
Manning's gender dysphoria is not a product of punishment for the leaks, it was a condition which existed earlier (and for which the response in the Army environment was part of the source of general alienation that Manning was experiencing at the time of the leaks.)