+100 to OP's suggestion! This is how it should have been from the beginning, especially with foresight to additional companions. Now, of course, they have to readjust again. Provided that Larian wants that at all.