So you have an issue with the name of classes. It doesn't matter how they're called. Your character can use both sword/shield and a two handed weapon. Each weapon gives your character different playstyles.

If we got rid of the warrior name and would call gladiator the same in both occasions nothing would change. You still equip another weapon and get new skills.
Oh nonono I don't, it's not that. But you can't equip a two handed weapon if you want or openly switch to a single handed weapon. CNJ is the only class that does this and there are no pros or cons that you have to weigh up and DECIDE what you want to sacrifice. You are stuck with the same type of weapon, with a different model and better stats as you progress.

To be honest I'm perfectly happy with the way it works now, but for the sake of argument (and the OP) it's nice to speculate.