I think it would be good if the combat music was started and stopped a bit more cleverly, such that you don’t get it starting and stopping when your citizens move toward and away from slow-moving enemies such as zombies/skeletons, or stationary enemies such as goblins at a camp. You can see (hear) this happen in the attached video, e.g. at 28:30 and 36:18.
This, by the way, might explain comments I’ve seen about the combat music starting and stopping in earlier messages (here and here), although there did not seem to be a specific topic for it.