I would say rogue. But looking what they did to my beloved class and spec when they turned it into Outlaw I'm not sure I want blizz anywhere near the rogue class again. Still, getting back old Combat would be a welcome step up, having assa have more poison variety (even if niche) and make sub play more like a dagger thief on GW2 with real short term restealths everywhere.