I think the main problem with warlord is actually rage. Warlord itself doesn't seem so broken unless the user is enraged. So nerfing rage would also nerf warlord enough.
Rage is only broken for one specific build which is 2h warlord warfare user. For all the other builds it's just a nice buff.
For rage nerf I'd just make it selfcast only and 2ap cost. Also fix it to only last one turn. 2ap cost would make rage+warlord massacre a bit harder.
Alternatively rage should make it impossible to use skills (and still be a selfcast only).
