[spiffytech]

I use Contexts ( https://contexts.co/ ) which works great.

You get per-window switching, with the normal picker modal (so you bring only your desired window to the front, and not every window you cycle through like Cmd-`).

As a bonus, Contexts has an option to only choose from windows on your current "space", which is really important for me.