It might not be quite what you want, but Command-(Shift-)-` should cycle through an app’s windows.
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).