I don't see why that's a problem at all...
If you failed your last shot, and took too long to do it, then of course you'll be auto-kicked before taking your melee weapon out, it's your own fault.
This feature is necessary, specially against xbowmen.
If you're an archer, and you got kicked-stunned, then you're doing it wrong, and deserve to die.