Long post is incoming. I apologize upfront.
I think the problem really is the rogues class. The overall class feels just like a warrior who forgot how to use heavier weapons and armor, while the warrior feels too specialized. In this respect, I would make a change that most people might not like, but since it's happening anyway, oh well.
Make it more like Mass Effect,
And by that, I mean have six "classes", three main, 3 hybrid, and specializations from there. Because of the way the classes are separated in ME, each one hass it's own feel for the most part. So I would break it down like this:
Warrior-predominately the same, but like the soldier in ME, can use any weapon (OH+Shield, TH, Bow, Daggers, Dual wield, Crossbow)
Specializations:Templar, Guardian, Champion, Beserker
Bard (replaces the current Rogue akin to the ME Engineer) Uses daggers, One handed, bows. Focuses on traps, poisons and stealth
Specializations- Saboteur, Shadow, Alchemist , Enchanter ,
Mage pretty self explanatory uses staves, daggers, Rods (one handed staves can dual wield with daggers)
Specializations- Force Mage, Keeper, Bastion, Fade Adept
Rogue (ME Infiltrator class) Uses bows, daggers, One handed, Dual wield (One Handed+dagger)
Specializations: , Duelist, Assassin, Ranger, Seeker (Templar Equivalent)
Battle Mage Uses Rods, One handed, Shield, TH
Specializations: Spirit Warrior, Arcane Warrior, Reaver, Paladin
(Hybrid Mage/Rogue class) Not named as of yet Uses Bow, daggers, Rods
Specializations: Conjurer, Runcaster, Witchunter, Shapeshifter
I was going to race gate the specializations, e.g. Templars only for non-Dwarves, but then only Dwarves can be beserkers, for lore reasons, but then decided that since they were going background heavy for DAI, then I would do the same.