Joey your math looks good to me, Andrea can make the earlier flight.
My philosophy on going home from a cruise is if I make the flight that is fine and if I don't make the flight that is even better!
OK, now I'm going to have to check my flights. I usually wait till about 3 months before to start checking but I'm getting into the pre-cruise checking mode after reading these posts.