It isn't totally obvious that he did, but I'm going with that version too. In the end when she plays the organ, he folds his hands like he'd never done in the movie before, maybe seeking some sort of redemption for the necessary evil that he just committed?