You can disable the tab thing in your first point. I did that almost as soon as it rolled out. No idea where the setting for that is though (I suppose somewhere

You can disable the tab thing in your first point. I did that almost as soon as it rolled out. No idea where the setting for that is though (I suppose somewhere in the gmail settings screen).