Hey Will,
I don't like using the stock macOS keyboard shortcut for this particular task, so years ago I asked Peter to support toggling windows – and to my delight he did...
I use this many times per day:
Toggle Between Window 1 and Window 2 in any Application
-Chris