What kind of wand did you imbue into your staff? I always recommend getting your staff to +7 so that it has 10 charges total.

Also, the ring of energy is really good with mage. Definitely upgrade that to +4, where it gives a +100% bonus.

Those two would take up 4 of your 6 remaining upgrade scrolls. I would likely out one into armor and one into your weapon, but it depends on the build you want to go with.