I decided to catch up on the episodes I missed, last night.
Overall, I am still not overly taken with the way the stories play out, as I still say too much of it is telegraphed for there to be any real surprises.

As for Rory, were none of you listening to what he said after Amy brought the Doctor back? Rory said "I WAS plastic!"

I do think the ending creates a whole new set of problems, because when Amy woke up, The Doctor had never existed in this timeline, so none of his adventures ever happened.
Which means that either the universe is in for another shake up (a reversal of the unwinding the Doctor went through), or that his adventures only exist in the memories of those close to him.
The fact that River remembered him right from the moment the universe was reborn, is obviously important as well as to the relationship she will have with The Doctor (or maybe she is The Doctor, or something like that).