[forthwall]

I feel like the best solution is a custom dropdown, instead of a modal, modals rreally take you out of context, when you're editing a form, its a bit jarring to be thrown to a modal, the best country select in my opinion is what you've listed, but also it's in a dropdown.