I recommend changing the ⌘-` shortcut to ⌘-§, which is right above Tab on Mac keyboards (Preferences > Keyboard > Shortcuts > Keyboard > Move focus to next window).
Having both in the same area of the keyboard makes my brain happy.
Having both in the same area of the keyboard makes my brain happy.