I am not sure how this makes it any less cumbersome.  Before the change, there was Armour with its listings for melee, mage, and range, followed by Weaponry with its lisings for melee, mage, and range, which is a total of six subheadings.  Now the article has Melee with its listings for armour and weaponry, then Mage with its listings for armour and weaponry, and then Range with its listings for armour and weaponry, which is still a total of six.  We have gone from two main headings to three main headings.

The direction we want to go needs to be decided.  Do we want to talk about armour and weaponry as topics and then break them down between the various classes?  Do we want to talk first about the class (styles) of combat and then break them down between armour and weapons?  My thought was, obviously, the first choice, while QuagmireDog seems to think it should be the second.  I do not think that either is more correct than the other.  They are just different ways of thinking about it or looking at it.  Which will give our readers more useful information without delving into that pit of fancruft our critics are lightning-fast to jump on?  Remember that we still need to bring the rest of the general combat information into this at some point - things like the combat triangle, player versus player combat, etc.