Thanks much for this. Wanted to use a staff with my mage all the way through the game, but it was too big of a gimp early game vs wands when you hardly have any spells. Wands were too obvious of a choice considering I didn't want to do the battlemage thing.

Only thing I wish this also did was make it so staff of magus also creates the corresponding surface like wands do. In that sense wands are still better, but all the same this still makes staff a lot more usable throughout the game than it was.