Why not give them some ability to transfer magical bonuses from one weapon to another? So for them, assuming they have a greatsword, longspear, shortsword, and a bow, they can cannabalize their bonus from one weapon, temporarily, and add it's +X value after all magical abilities are assessed as...