Oh. Well in that case I tentatively agree, since run & gun is pushed significantly farther down the ability tree in XCom 2. Much harder to get guaranteed shotgun kills early than it was in EU. Only problem is that weapon upgrades don't transfer over, so you're either stuck using an un-upgraded rifle or throwing the upgrades away when you switch back to the shotgun. I did sometimes use dedicated rifle assaults in EU, although that concept was replaced by the Infantry class in LW.
Although that does give me an alternate mod idea, make weapon upgrades apply to the sword instead of making blademaster scale with tech level. I imagine that wouldn't actually be too hard, mostly just copy whatever code the pistol has that makes it benefit from weapon upgrades. Can you imagine hair trigger on a sword though? If you yellow moved to slash someone, would it give you your entire turn back? Good god.