Okay, lets break down where we want things to end up by power source.
Martial
Protector: Fighter
Assault: Rogue, Ranger (Fighter)
Synergist: Field Marshal? (something along these lines)
Strategist: Monk (Monk has always fallen between the cracks, lets slot him in here)
Arcane
Protector: ?? (does Arcane need one?)
Assault: Summoner
Synergist: Alchemist?
Strategist: Wizard
Divine
Protector: Paladin
Assault: Inquisitor?
Synergist: Cleric
Strategist: Priest
Primal
Protector: Shifter?
Assault: Barbarian (/Protector?)
Synergist: Shaman (we can trash the mechanics anyway, they weren't great)
Strategist: Druid
Martial
Protector: Fighter
Assault: Rogue, Ranger (Fighter)
Synergist: Field Marshal? (something along these lines)
Strategist: Monk (Monk has always fallen between the cracks, lets slot him in here)
Arcane
Protector: ?? (does Arcane need one?)
Assault: Summoner
Synergist: Alchemist?
Strategist: Wizard
Divine
Protector: Paladin
Assault: Inquisitor?
Synergist: Cleric
Strategist: Priest
Primal
Protector: Shifter?
Assault: Barbarian (/Protector?)
Synergist: Shaman (we can trash the mechanics anyway, they weren't great)
Strategist: Druid