Watch it again. It's a great excuse to see Rory in his pants. Rawr. Oh, and he does remember being plastic, if that helps.
I'd say no, he just has the outfit. If he was he could have just waited again and then come running in to save Amy from that last angel.