And just to make sure your brain always has to concentrate when switching (beyond the fact that you now need two sets of shortcuts instead of one): Cmd+Tab cycles from most-recently-used (what you would expect) but Cmd+~ blindly switches to the next window in a cycle (not what anyone expects or wants).