Completely agree with you about Amy and Rory - I do wish the arc (if you can call it that) had a bit more background to it, but I still believed it and didn't think it was OCC. Particularly because a lot of their relationship about what they don't say to each other, and this was in that vein.

Also think that the big theme for this season is going to be memory - which has really been Amy's theme her entire run.