If you find yourself in combat with messed up weapon groups, holding shift and pressing numbers 1-9 allows you to quickly select and deselect weapons. After a few trys you'll be able to quickly fix your weapon groups in just a couple seconds in the middle of a fight.