It has been at least partially confirmed that in 2.0 they will be doing your option #1. At least, that's what the screenshots look like.

I... Will be sincere, I don't think they can change the current system too much without entering into the 'this is 2.0' territory, and among the changes I don't think they can make is the basic UI layout of crafting.

Also, a little while ago there was an announcement "In 2.0 you will be able to resize UI elements". Do you know what implicates? That they cannot allow you to resize UI elements on the current version. Hell... I'm even having a moment and thinking "Oh god are those menus fixed size in such a way they can't fix it on THEIR end either?!" but...