Oh, the "pigeon hole" in D:OS 2, yes... that table with "which character class gets which civilian skill and talent" still gives me a headache, gladly I'm just one playthrough away from completing all the Steam achievements, then I will NEVER start a playthrough without Fort Joy respec mirror again, seriously.
If I could change ONE thing in D:OS 2 it would be to add the ability to fully build companions on recruitment (not as a mod, but as a non-achievement-relevant change in the game, because this terrible idea of wasting talents and civil ability points only hurts until Lady Vengeance anyway, but makes the first act more painful than necessary).
I mean, the BEST option to solve the unintended "to play properly you need to save scum, otherwise you will never see the whole game" fallacy would be to predetermine rolls as early as possible. So when you reload you get the same roll, this would take the save scumming away.
