Not only did I successfully get stuff done in time for the cleaners, but my imposed order on my spouse's space was not too over the top. I think after 9 years of co-habitation I've finally found a reasonable balance. It boils down to mostly: Don't move the piles of stuff from where they were (when possible).