I really don't want our mastery to be related to TeB anymore though. I hate that design. TeB should be something you're looking forward to generating and consuming. Our damage shouldn't be solely reliant on TeB. I don't want extra chances to generate TeB nor do I want its duration to be longer.
I'd prefer seeing a baseline damage increase mastery or something that smooths the playstyle a bit more. Kind of like Vwells suggestion.