You'll be able to upgrade it without xur. At this point, you should just wait.
Yeah wait on upgrading weapons. Armour, though, if you find that Xur has one that has higher stats like Discipline, Intellect, or Strength... I'd say it's worth upgrading if you're into that sort of thing. I like to have as close to max stats on my gear as possible.
Max possible stats for Light 36 (Level 32) gear:
Helmets: 128 (64 split max per stat on Legendary)
Gauntlets: 113 (56 split max per stat on Legendary)
Chest Armours: 170 (85 split max per stat on Legendary)
Leg Armours: 156 (78 split max per stat on Legendary)
Split Exotic Helmets: 73 per stat / max 146 total
Split Exotic Gauntlets: 65 per stat / max 130 total
Quick Guide (Level 32):
Every 3 points of
Intellect = 1 second faster charging of
Super
Every 8 points of
Discipline = 1 second faster charging of
Grenades
Every 7 points of
Strength = 1 second faster charging of
Melee
Beyond I think 278 of each stat (at level 32), there is no bonus as that is considered 100%. Certain gear and subclass perks can decrease charge time beyond that though.
I'm like 99% on the above. Not sure if Intellect affects Orbs of Light energy.
