Well, you managed to pretty much nail what I was planning on doing. For now, yes, the armor should go in its own sub-category with the weapons, and we can later go into much more detail if you'd like. But right now weapons are: a) more diverse and plentiful in types, b) thus more fun.
And yes, I never had any intention of moving weapons to its own menu or out of the Miscellaneous menu. But hopefully when the project is all finished, it will be much easier to navigate it.
Now, time to begin work on the outline that you suggested.