I have the same gripe. Think about giving Switch (https://github.com/numist/Switch) a try. Cmd+Tab still functions as normal, but Opt+Tab (you can change the default keybinding) will allow you to cycle through all available windows on a single desktop.

Not a perfect solution, but it's a big improvement imo over Cmd+`.