The scene felt akward and tacked on to me and it complicated the relationship between Amy And Rory, Rory even said in the next ep. that he felt it was hard to compete with The Doctor.
I don't agree with the awkward and tacked on, however, it's GREAT that it complicates Amy and Rory's relationship. There is story potential in complication. If they had an uncomplicated relationship THEY would be boring. They would be like Barbara and Ian.
(Ok, I have to admit, haven't seen a lot of Barbara and Ian, but what I have seen, they are just flat, boring...)
There's no way Rory could compete with the Doctor and he said as much and it really IMO makes Rory feel like a fifth wheel. And I didn't think Ian and Barbara were boring but then they weren't a romantic couple either for that matter.