Agreed. It seemed more like the story was built around Amy and Rory leaving rather than Amy and Rory leaving being an organic part of the story. All love conquers all bullshit and what have you. Hate to say it but, he really channeled RTD when writing this one.

On an aside, I also have to wonder if we are getting to the end of River Song being around. She's already done the Byzantium and been released from prison. It can't be too long until the events of Silence in the Library. Maybe, with the fall of the eleventh, we will see her receive the old sonic.