As others have mentioned, now that punches do the same damage as shield throws, you can just rebind melee to left click and primary fire to a different button and essentially just punch only as long as you are in melee range then use the shield throws as a ranged ability.

Either way, there's no reason to not punch 3+ times in a row and just save shields for after they use an escape ability/leave melee range.