If it were my choice I'd replace the fairy dust shooting mage staves with mundane quaterstaffs or polearms, then completely decouple classes from weapons.
DA as a series allows very little flexibility in terms of quest solution and character builds. I like the Fallout series for that. You can attack the enemy or sabotage/steal his stuff or convince him to go away/give up. There are many possibilities in character types too. DAO offered more of that with the herbalist, survival and poison skills (for example).
The Inquisitor doesn't come across as a very skilled individual themselves. Sure there are the knowledge perks, but it's not the same as knowing how to track prey (survival), how to make poisons or potions (herbalist), etc. They've got people to do that for them.