You can change the shortcut in System Preferences > Keyboard > Shortcuts > Keyboard > Move focus to next window. Try also using “Move focus to active or next w

You can change the shortcut in System Preferences > Keyboard > Shortcuts > Keyboard > Move focus to next window. Try also using “Move focus to active or next window”. I have that mapped to Option-Command-` (and implicitly Option-Shift-Command-` for reverse order).