TBH, both ideas seem really good. However, with regards to the armory system, #2 seems more feasible imo