I thought that the Peter Pan/Wendy thing was stronger with Martha or Donna as the companion, because they both seemed more mature than the Doctor in a lot of ways, whereas that doesn't apply so much to Amy. OTOH, Matt Smith's Doctor is perhaps more Peter Pannish than David Tennant's was.

One could extend the metaphor by comparing the Master to Captain Hook, and the drums in his head to the alarm clock in the crocodile!