Or is the solution to stop making every other class just as good in combat???
That is a route I think should be explored. Rogues can be great IF they can sneak attack you, but in 5E getting a SA in is way too easy. Smites should be before the attack roll, not after. Stop the pew pew of cantrip spamming in combat. Let casters excel in the special way magic can allow them to do on a limited basis, let martials (Fighters, Barbarians especially, and to a degree Monks, Rangers, Paladins, and Rogues) be the best (or better at least) in combat. THAT is what they are built for in many ways...