Hey Swiftwynd, I just finished a run with a solo mage generalist. Staves work well with warrior skills! My Crippling Blow does around 350 damage with no points in Strength, and Battering Ram and Battle Stomp are invaluable for soloing the game. Those skills, rage and Phoenix Dive are the only warrior skills I used, though, so they're the only ones I can comment on. But combined with hail strike, winter blast, electric discharge, blinding radiance and restoration, you can end up with plenty of both physical and magical CC, as well as good sustain, so I found the combination to be highly effective. The skills don't end up scaling with intelligence, though, since they're still warfare skills. But the chance-to-hit does, and they do use the base damage of the staff in their calculations, as you postulated.