According to Yoshi they are aware of the button bloat and are looking at more doing upgraded abilities rather than brand new ones. So we may just see a bunch of upgraded abilities and traits rather than getting any new buttons with the expac. Buttons still may be trimmed down, but nothing major most likely till 6.x.