The light at the end of his tunnel is getting vamped, which mutes the emotions (except when it comes to the people he loves). So I'm going to "fix" him. It's just a matter of keeping the psychology at some semblance of "real" before I do.

He already goes into Soldier Mode on occasion. I think it's "just" (for a certain value of "just") taking that bit of him and calving it off so he doesn't remember when he does it. Maybe once, before the climax.