Meanwhile, I went with the decision to enhance the individual story for each expansion theme instead of having them all just run on the main story alone. I disabled switching for this reason, so that the player can progress through the side quest for their own chosen theme.
The new NPCs and encounter system will have the main character facing enemies from all expansion themes and there will be a strength and weakness strategy coming in.