I like #1 neither, but I don`t see a way around it, the way Bungie implemented upgrading up to this point. The upgraded VoG-Wepaons have to play really-hard-to-get, so that crota-weapons have at least this advantage over them;-)