I don't want the desktop to try to be too smart.

I'd rather if it lets the user choose if she wants the primary desktop to either be portrait or landscape, and focus on refining the display of that mode. The secondary mode will be the one with a quickfix 'icons reflow' treatment. It should also give the option to fix the desktop to a single orientation (either portrait or landscape).