Well, I believe the way you have it set up you could just leave it how it is. Keep the Legacy interactions the same but just make the pop-up close button on the new interactions. Target the “modal-wrap” and then change “Affect” to “All elements with this class” instead of “Selected Element”. That way, any instance of the pop-up would close no matter what.
Here is a screenshot of what I mean:
