Yes, I agree. Maybe just reiterate what OP said in private. Without making a big scene, saying something like "Hey, you're doing that thing again where you're making it seem like you're one upping me, and you're making me feel diminished." There's really nothing to say to that, depending on their reaction, it'll show you whether to cut this person off or not