This tip saved a lot of pain.

If the application you're switching to has windows that are minimized, you can unminimize them by holding the option key, then letting go of the Cmd key.