Yeah focus on the weapon UNLESS you have a strong fire team in which case typhon is better. Since my fire team is the weaker than every team I have available except for possibly wind, I'm just going to build up the weapon.