For me, the current design is more than fine and the problem lies mostly on cd stacking and certain abilities (chaos bolt, frost bomb etc - I am not including TfB because it is hitting for as much as it should hit, meaning it does not oneshot anymore and it does high but not overpowered damage).