I hated how switching weapons felt by default since it also cycles through your pick-ups as well so I found a good fix for that. In Steam Input, set Y, X, or Triangle (depending on what controller you use) to the 1 key, open the buttons settings and enable cycling inputs, then set the cycled input to the 2 key. This will make it swap from just your weapons without adding the button indicator next to them like what happens when you directly bind the actions.