With the current system they have for upgrades I think it would be better to make raid-exclusive weapons and gear upgradeable to the new cap until the next big expansion (this case...the Comet expansion) just so we can have a lot of time to enjoy the weapons and gear we worked hard to obtain before we need to grind for newer, better equipment. If they do have a 10-year plan for Destiny then chances are we could receive more big expansions and between them time to enjoy our equipment. That being said, the upgrade system could benefit greatly with a change. I think JoshLags' idea is very nice. We could, for example, either do certain quests to allow the gunsmith to upgrade our weapons or we could use upgrade materials to purchase parts needed for an upgrade. I think the whole franchise could benefit.