yer, that's a different system
i actually suggested something similar, weapon switching with fixed ordering i.e to say, you can quickly switch from bayonets on to byonets on with firing, and back again sans animation, different from firing without byonet which was more accurate, but its too complex a system for the little illusion AND it lends itself to exploits i.e. switching to firing with bayonet on in a second, since that would have no animation.....
Currently this exists in PR (switching from LMG hipfired to LMG prone-fired - The latter lacks animation)
I think the solution, if THERE IS one, is looking at how the projectile itself can be used to make it work a la thee idea of alternate fire.
A handheld knife should have lower punch than a byonet imo. so while bayonets use rifle ammo in stab-range, kinfes can use a lower calibre round, something like an STG44 round, say. And maybe an alternate slash attack which firess differently.
But tbh, I don't care much for the current melee damage. Now its use is fun only, not practical - Unless you get the person by surprise.