I decided to watch the Library two-parter last night, and agree with you on how much better she was in those episodes. That said, I wouldn't be surprised if they were trying to make her out to be younger and more impulsive than the professor she grows into...but over-egged it a little.

In any event, I think this was probably my favourite episode so far, certainly better than last week's Dalek one, and Amy continues to stand head-and-shoulders above any of the other recent companions.

Also of note: I thought the pictures of him in her diary explained your concerns over the regeneration issues. She evidently only met Ten once, and likely recognised him from said images, but for all she, at first, knew he could have been Twelve or Eighteen or whatever. (I assume we're doing away with the regeneration number limit these days. I'm also assuming said diary isn't the most organised when it comes to labelling faces in order. But then, could you imagine The Doctor taking the time to make sure it's all correct?)

I think I'm jabbering about nothing now.