>keep the main story stuff focused on the player character
>push the other character's shenanigans into the optional content drawer

Hoyo managed it with space china where they put Dan Hang's part of the story in a side quest and then fucked it up again later during the whole Feixiao bullshit where even your character goes "but I didn't even get to do anything"