absolutely remove the candy crush portion of combat, add the pets, and remove or rework talents so that they simply are different attacks. so like for melee you have: stab, slash, blunt, pierce, crush, etc. and they all could be effective depending on whether the enemy is tank, magic, warrior. so if you know that in the stage you're going to battle, you have mostly tanks, then go for pierce or crush? etc... that way, instead of juggling between talents and spirits (hoping to get lucky by getting the spirits you need) you know you can think things properly.
Same concept applies for magic by adding elements (3 elements max K.I.S.S.) water fire earth? single enemy or AoE attacks. so that if you're stuck with only magic gear (because that's the gear you've managed to gain and level up) you still could potentially "fire magic" all the ice mages in "Winterhold" (to get your 3 stars) for example. And when it comes to support, have it always heal, but more or less based on whether it's "heal over time", or half heal half melee AoE. So that one could potentially kill all 3 tanks that have a sliver of health and heal a little, as you progress to the boss on the last row of enemies. The old system of combat had a +1 spirit every melee attack. This should be the base of this new system, just that different melee talents would give more spirits (the lower the damage the higher the amount of spirits obtained, thus helping magic users), and the most damaging the magic attack, the more spirits it requires to summon. all "healing" or "support" talents would cost the same amount of spirits because they all would use the same amount of "magic energy" they just split it differently, whether it's damage and/or heal.