Almost at the end of another play though so looking at what I want to do for the next one.

I know party wise that I want to take Karlach with me for the romance and Wyll as he's the only companion I've not done a full run through with yet (all previous run throughs he has spent the entire time at camp, literally not taken him anywhere).
That leaves me stumped as to what to fill the last two slots with.

Firstly there's me... Given the best way to get approval with both Karlach and Wyll is to essentially be a Do-Gooder I'm leaning heavily towards Paladin - taking Oath of the Ancients to provide some healing support.
However this leaves me feeling short someone to provide both trap-disarming and strong crowd-control options (e.g. confusion, hold person, etc) - I know Wyll can provide Hold Person (for example) but given the shortage of Warlock spell slots in a fight I feel a second source would be beneficial here.

Which then leaves me in a bit of a dilemma for the last slot. Astarion is the only high dex companion out of the box so for trap-disarming he's great, but he doesn't have the Int to support Arcane Trickster, (yes I know there's the int head item, but there's better suited head items for him I feel). Shadowheart is solid for CC out of the box but has nothing to support slight of hand activities.

I've done Cleric, don't fancy being a Bard and I'm saving my Spore Druid for a less good playthrough.

Also I lean more towards the RP aspect than the Power Play - (so I'm more interested in something that "feels" right than something that does 20 attacks per turn for a million damage) as long as it's viable in a normal mode fight (whatever the middle difficulty option is)

So what's the best way forward here? Give Wyll some levels in Sorcerer to boost his spell slots? Re-distribute Shadowhearts stats and give her some Thief? Make Astarion a Bard?

I'd would rather keep my companions as close to their concepts as possible again for RP reasons (so I'm not keen on level 12 Wyll not having any levels in Warlock for example - ideally I'd keep him a rapier wielding blade lock at least for a few levels).