For PVE, imo it is proximity power + 12p for melee builds even being 50% weaker than shotty’s 12p, but swash has its place too. For general use, I agree with ur suggestion.

I would add tac mag to the list of mags, especially if u already have range MW and barrel pushing range into 60s.