The very simple solution is to wait. I always wait for the first major patch to OS X before upgrading, and a couple of months before new hardware. While I don't have the latest shiny gadget, my life is a lot simpler.
I shudder whenever I see someone upgrading the development machine their professional life depends upon to the new version of OS X on release day.