Use Command+` / Command+~ to cycle windows of current app even when using State Manager?

Is there any way to keep using Command+` (aka Command+~) to cycle through open windows of an app even when using Stage Manager? This would be extremely useful and efficient.

It's very common to want to quickly cycle through all open windows of a single app, even if they're in different "stages." Unfortunately, MacOS changes how that keyboard shortcut works when using Stage Manager, to instead cycle through all windows within a "stage" even if they're in different apps. That is indeed a very useful shortcut feature, but it should not be the SAME keyboard shortcut.

Not only is it confusing for the behavior of a commonly used keyboard shortcut to keep changing, but both functions are very useful and should be possible when using Stage Manager, by assigning different shortcuts. It's also a pain to have to scan all the Stage Manager thumbnail groups to figure out where the other windows of a particular app are hiding out. Being able to cycle quickly through them would be much easier, and smarter OS design.

Is there any way to do this? Or to just return to the original function even when using Stage Manager?