they’ve never solved that problem and I don’t think they ever will, it’s a fundamental tension caused by smashing two different games together.
I’d approach it by having ‘tactician’ character roles to determine battle force multiplier, and attaching a resource cost to how many battles you cam personally direct. Allow you to take on debt to manage a turn of many important battles, but attach a cost so the game pushes back against you doing them all.