I think you're right, though, that he likes who he is now a lot better than who he was then, and doesn't want to be that person anymore.

Yes! It's the reason he tends to run away from fights if he can, I think. He could still be a killer, but he doesn't want to be.