What you have sounds good. I would not bother upgrading unless you can find and afford something much better that does not require you to add luk. A few extra points of magic attack would not make a visible difference. Does ems have maple shine wands? They do not require luk at all, though the well-scrolled ones are expensive.