I think I got this one from someone else, but "the girl who waited" to "Rory's Choice." Both are good titles but I think the second option makes a really nice connection to the episode "Amy's Choice," both being about their relationship and the passage of time.
Sure? Love a good pun; but the title is like the least important aspect of an episode, beyond being able to remember roughly what happened when looking through the list of episodes