littlegreenman your way may work too (it's just the mirror image of my mother's) but would it perhaps be easier if the "passport switch" occurred when you're "going home" rather than going out?
Particularly since it's really hard for a airline check-in even in an outport to deny you the right to "return home"?