Either we need our companions to be able to automatically jump in when we hit their area of expertise (highest bonus in the party), or a way to manually swap out characters. The 1st is harder, but in my opinion better.