One of my few recurring annoyances with Moffat is the way that he seems unable to write Amy and Rory consistently. They're great characters, but they were both all over the place in series 6, often in episodes Moffat wrote. The divorce felt completely contrived.