Actually, it looks to me like you're almost ready to go with what you have. The biggest concern is that you have stockpiled staves of destruction rather than scrolls. That is a big problem, as you're most likely going to melee Morgoth, and he drains charges.

Keep replaying levels until you've rectified the destruction problem. If you happen to find other gear upgrades in the process, great. If not, you can win with what you have.

And yes, keeping up those buffs full-time is a good idea. They certainly improve your survivability, and as a rogue, you don't really need to save mp for other things. Detection perhaps, but basic detection is cheap, you have telepathy, and enlightenment potions are common in the late game.