It would have made so much more sense if he thought he was going to permanently die, like he was fearing back in the cafe. But no, apparently that bit was totally forgotten.

I don't mind the Doctor being reluctant and wistful about changing, but this was played up so damn much. Like he hasn't done it nine times already.