It gets complicated, at least the way I have combined the two. Isaiah writes about a time of peace where the wolf and the lamb, the leopard and kid (young goat), the calf and the lion all live peaceably together with a young child to lead them.
Jump to Christianity where Jesus is described both as the Lamb of God and the Lion of Judah. Judah (name means praise) was the tribe that went into battle before any of the other eleven tribes. In all of this we have praise, warriors, and peace/forgiveness. What we see in all of this is a place for both warrior and peace. We see both in Jesus, and how they work together. At some point in my life (years ago) I had the idea that the so-called negative emotions (such as anger, jealousy, meanness) had an opposite/sister emotion in peace, generosity, kindness. The lion emotion was never meant to eat the quieter emotion, and the quieter emotion was not meant to flee or be eaten by the stronger emotion. They are meant to dwell together. To me, the stronger emotions signify a need to act, and that action can be tempered and include wisdom by joining with the quieter emotions.