I use two battlemages as I like the man at arms skills of crushing fist and battering ram with melee between cooldowns in the early part of the game but your party is viable. Suggest 1 point in scoundrel for Bairdotr so she can be accurate with grenades when not shooting her bow for crowd control. There are many items in the game that add to charisma as well as trait bonus so you do not need to put a lot of points into it on level up. That is also true of strength, intelligence and other attributes. Combining points off gear will reduce the points you need to put into those skills and allow you to add or augment other skills.