People have mentioned Rory on the Dr Who comm and I thought it was silly as he's so obviously not v heroic - but that begins to make more sense when you explain it that way.. maybe Rory instructs River to do something that will kill him so as to save the Doctor - who is of course his rival, kinda -- that might make you think of him as the best man you ever knew.. esp given River would obviously be intensely grateful to someone who saved the Dr. Plus, it would write Rory out so Amy can continue to travel with the Dr - as I don't think Dr plus couple is a sustainable long term format and we know both Matt and Amy are signed up for another series. (No I don't know exactly why I think it isn't sustainable but I just don't.)

My own crack theory re the Angels is that this whole series is set in an alternate universe so far (where daleks did not invade Earth, etc as per Amy's memory) and the finale is going to be about putting things Right; thus it isn't surprising the Angels have a diferent modus murder & only the Dr remembers how they ususlaly do it to be puzzled. (I'm also fairly convinced the "madman" who wrote the book all about the Angels is the Dr himself at some future point - after asl he'd know it all and know his earlier version needed it & he's been described as a madman twice already this series!)