I'm pretty sure Rory's big moment was in a Good Man Goes To War, though there still might be something going on there, what with River saying she killed a good man ages ago and maybe that IS Rory after all. I don't know. I just kind of want the whole timey wimey Amy-Rory-Melody-River-Doctor thing to just wrap itself up already, I feel like it's starting to collapse under its own intricate weight.