I agree with this, but my concern is that the tabs would then exceed 50% of the page's width on some do=X (the open tab is pulled out of the drop-down, as I'm sure you've noticed).
The whole reason we added the menus is to reduce the clutter created by the tabs that was taking away from the content presentation. Perhaps we can eliminate the Watch tab entirely and move the control to a different spot, but I believe that that too needs to be prominent.