Oh yah, I forgot that we already seen later River earlier. Timey-wimey, etc.

OMFG WHAT IF AMY FINDS OUT THAT THE DOCTOR SAW RIVER DIE?

I think if he gets them married off he could scale back a lot on River and then it wouldn't have to be about her. I thought this year was supposed to be about Rory? Did the Moff just lie to us about that?