I'd prefer simple story expansion, no new class, no new races, no need to rework the base game to fit the new class/races - although some aspect of base game do need a bit of touch up.
It can start in the middle of the game during House of Hope raid, the hook is already there.
