Google's new categories help and Inbox sounds promising but I feel like there's too much assumption going on in parsing the emails.
Really, I'd like email addresses to be on the domain level. For example, mail@cool_username.gmail.com and flights@cool_username.gmail.com. Then, give me granular control over how "mail" or "flights" get categorized and give me nested categories.