What can be done to Warlord and Peacekeeper?

Unless I'm wrong, the general consensus is that these are the two top characters right now, both for PC and console. I'm an Xbox player myself, so Shinobi is quite annoying, but that's beside the point. For both of these characters, I don't really know what could be done to them without completely reworking their kit, and that just isn't going to happen. They're just strong by nature. The ideas I've been mulling over for Warlord would be: reduce the damage on his zone, additional stamina loss on whiffed headbutt, remove the super armor on his side heavies, and bring his dash recovery in line with everyone else. Why his zone does more damage than others is beyond me, and it doesn't even make sense looking at how little room he has during the swing to build up a heavy hit. There's no reason for it to do more damage than his lights, not to mention the tracking on it is incredible. Adding additional stamina loss on a missed headbutt aims to discourage it from being a "throw it out whenever you want because why not?" move and make it a bit more of a risk. As far as armor on his side heavies, he just doesn't need it. As far as I'm concerned, his side heavies are what he gets on a wall throw and that's all they need to be, unless you're really ballsy. His dash recovery is faster than everyone else because...I don't know why. Maybe it was an oversight and the devs left it in, but it just doesn't need to be there. I know these aren't the biggest nerfs out there, but he's just a strong character because of how his kit is built and there really isn't a way to change that without reworking him completely. Peacekeeper is in a similar spot, and all I could really think to do with her is adding something to her "Hero Specific" part of the move list where she loses extra stamina if her attack is blocked. I thought about a longer recovery on blocked attacks (like when Conqueror blocks a heavy), but that might be too much. If you have other ideas, I'd love to hear them. If you're of the mindset that Ubisoft should give everyone 50/50's and buff them up to Warlord's level, then you don't really need to bother commenting because your ideal state of the game is very different from mine. Thanks!