Remove RDM (and WHM) from the Magian Staves. Add Affinity Swords (and Clubs). Problem Solved.

(And letting RDM in on the Dagger trials would be nice too. Or getting native access to more Sword WS.)