I agree with you, Pebbles - nothing has been flipped.
Posting this cap again to highlight what you're saying:
I think both women are going to have the exact same walk in and out, just like in previous seasons. I don't see any reason to change that. Chris walks the women in, and then Andy walks the one that he doesn't choose to the limo and then comes back and prepares for his chosen one to come.
The dog tags that we see at the FRC are Andy's personal tags being given to the final one. There doesn't have to be a previous instance where a set of tags has been introduced to one of the women for there to be signficance in the gesture of Andy giving his personal tags to the woman he proposes to. It's about embracing his life as a sailor and member of the military.
The dog tags will be there for both women, and will be given to his final one. The setting remains the same so that the women don't know when they're coming in if they're final one or not. Fleiss doesn't like to give anything away until the build them up, tell them how great the experience was, then the but... speech for the woman who isn't chosen at the FRC.
The dog tags that Andy and Tessa wore on her hometown date were purchased souvenier tags at the Aerospace museum in DC. There imo isn't any connection between those souvenier tags and Andy's personal service tags. There are completely different meanings behind each of them.