I'm probably planning way too early, but seeing that MP upgrades on A class Souls carry forward to their S class counterparts, they don't differ to the point that the S classes prefer different MP upgrades from the A classes, do they? And I take it that even with the future content/buffs Medea and Yorimitsu are still top priority S classes.