Yeah, the fact that Amy can either be the Doctor's little girl or Rory's wife quite frankly ticked me off hugely. And the one time she was herself last episode after surviving on her own for 30 years, she of course had to die so that she could go back to being the loving companion and wife. The fact that Rory is only a Pond when the Doctor decides he is (rather than input from his wife) also annoyed me.