I have an issue with the inability to replenish during combat. Maybe give them a timer so they replenish instantly after combat, or after 30 seconds/5 minutes/whatever.

There can be some long fights ...