Hmmm, that's true. Which makes Rory a bit more like River with her brainwashed fighting skills. If Amy is a parallel to this season's Doctor, though, and earned her kicks the hard way but that version of her has to die off (after having interfered in her younger self's timeline), I wonder if we're going to need to have a moment of younger Doctor coming face to face with the older Doctor who is going off to his death, so he can see that path and learn from it. That is how A Christmas Carol worked with Kazran: the younger Kazran saw the older and chose a different path. You could make an argument that the older Kazran basically "died." And the Doctor was the one who tricked Kazran into changing himself in that way, as he was the one who tricked the Amys here in order to give her the fuller life she deserves, and as he's the one probably tricking himself in the grander scheme of the season.