Greetings, so the current weapon swap system feels very clunky especially in combat because it doesnt always break the animation to actually swap ur weapon even u clicked which means it can feel delayed / clunky on those points.
My suggestion to fix weapon swap entirely is to make weapon swap instant and in prio que above any animation etc, so that no matter what u do or etc u can swap weapons, example cancel ability that way it goes on cd sure but u swap weapons to combo it or etc.
Put a global cooldown of around 6-9 seconds on the swap and along with instant swapping priority it should do the job, atleast to my experience, it will also open up / allow some more complex comboing in terms of using 2 diff weapons and combining their abilities without being able to abuse / or / and spam it due to global cooldown.