I think the weapon reward in the two vendors you don't collect it from first should change to the ornament once you get it, so you only have to do a double reset for one of them. I'm not sure if that makes sense worded that way, or if it's possible from a development perspective, but the example would be this: Reach Rank 16 for Vanguard, claim the weapon. Rank 16 reward for Crucible and Gambit becomes their respective ornaments. Vanguard ornament still obtained from Rank 16 after a reset.