Staff just give material damage. So you don't have spell damage on it. It should give raw spell damage too.

And Staff should offer 8-10 item affixes to face/match 2 one handed warrior affixes (or 2 pistols). This way it is the staff do not compete from equal to equal with warriors because they buff much more affixes and this allow a lot of additional combos and builds. A lot of mage build is broken, so you need to make it worth with 8-10 affixes or just doubling their current affix buff.