Yes, my guess is Kate took Aaron to Claire's mom.
And while they were supposed to recreating the original circumstances for the flight, it seems as if they all switched roles. Just my thoughts, but
Sayid is obviously in Kate's place
Hurley is in Charlie's
Kate may be in Claire's (I'm thinking she tried to get pregnant the night before)
Jack is in Locke's with the whole faith and adventure thing
Locke is in Christian Shephard's place
Sun might be in Jack's place with trying to bring Jin home (jack & his dad)
I also agree that it seems Ben may have tried to kill Penny

Of course, that may explain how Desmond comes back to the island, because you just know he will.
I loved this episode, although it raised more questions than it answered!