I like both ideas a lot personally, however I agree that option 2 seems like the best "fit" for the armory system. There have been a few posts including yours that have outlined a few ideas for it already, of course I'd like to see how the devs themselves plan to go about it.

Either way, my vote is cast for option 2.