Favorite relationship: Maggie and Glenn. I really love these two, going through this shit of a world and they still manage to find love, they still manage to find each other. Its amazing really. Glenn and Maggie forever.
Regarding Aeris. I believe she was prepared for either outcome. I choose to believe that she was ready to face death if she were killed but that it wasn't a "goal" for her. I believe personally that her plan was to summon Holy in the area below the city and then, assuming what happened did not occur, intended to meet again with Cloud and the others, explain her plan, and continue with them.
Sure; maybe not express her plan and continue, since that’s risky business, but.
When she lifts her head in the Forgotten City, I see a look of triumph. I think it’s more likely that she thought the danger had passed at that moment than anything.