yeah it's a good idea for QoL. a dedicated quick change/default weapon loadout key would be handy on PC too.

Could just change the 'show/hide weapon' key function to always draw the first weapon from the first 2 slots, plus a shield from the other slot if appropriate/available, so one press to put away your pick/hammer etc. then another press to be armed for combat. A blank first slot could signify default fists.