Sorry, I'm not playing with a controller, so this may not be relevant, but just clicking on which weapon you want to equip in the main interface (bottom, next to the round character portrait) should swap to it. There's no cost for swapping between ranged and melee or vice versa, so go wild.
