Option 1 would be cool if there was a setting of how much you need to zoom for the 3D units to appear, or a hotkey to toggle between 3D and 2D.

Personally i'd rather have option 2, as it currently is, but that's because i have two monitors and i can afford to fit a whole new window with 3D view ...