I usually max the weapon mastery if I'm set for that weapon.

Well, sword is still nice, but any kind of weapons are viable now. Even the axe, with the new runewords.