Swap them all!
Don't move your windows from one display to the other.
Move all windows from your main display to your secondary one, and the other way around, at once. Also, you can swap front most application windows or just front most window.
Swap them quickly using a keyboard shortcut or even easier with a systemwide menu icon.