You're the best! Can't wait for these changes to go live.

I had a similar issue on Linux maybe a decade ago. My solution was to write a script that ran on login/startup (I forget which) that shuffled my monitors appropriately.