You are correct. It is not contradictory. It often takes force to keep the peace. Both elements can successfully exist in a character at once - no one has any doubt Superman has both - but they have to exist in balance. Wonder Woman as written has no balance. She stridently, constantly, preaches peace while enthusiastically embracing the warrior. One of those elements needs to be dialed back for readers to get a firm grasp on the character.This is another thing that has been completely misread about the character ever since Kingdom Come's hamfisted take. There is nothing whatsoever contradictory about that, any more than a cop or a UN peacekeeper carrying a gun. Creating a peaceful world means dealing with warmongers.I find her Warrior/Peace Bearer stance a contradictory and clumsy mix.
Timm's was my favorite version to date.The only media she's gotten since has been in the more limited realm of animation from Bruce Timm, a man who couldn't write a proper Wonder Woman to save his goddamn life;
On Cheetah: the one thing Cheetah has in her favor is Gail Simone is writing her along with Wonder Woman's villains. Simone excels at making lesser known villains into fully realized characters. So, there's some hope there.