It's not a perfect solution, but sorting Armor by Defense and Weapons by Damage works for me.