I suspect if you could manage to bring in a person to clean at least for a couple of weeks, you'd have a slightly more calming environment for all concerned. I know it soundns like a luxury, but I think it would really make a (positive) difference for you.

On LJ, there's pup_ajax, who's a professional housecleaner in SF (you or Joe would have to pick him up and drop him off at Caltrain or BART).

I *might* (and I stress that word very strongly) be able to convince pony to put in some servitude at your place over a weekend...but you'd need to dangle Joe as a lure. (Not that that would be a problem; I just felt full disclosure was necessary.)