seconding BJJ or wrestling as focus (and learning to sprint well), boxing or kickboxing as second if you feel the need. The vast vast majority of civilian fights that can't be de-escalated are not cinematic circling-and-striking but instead are very sloppy tantrums that immediately go from shoving, to clinching, to the ground. Being able to control someone's limbs is important, especially if they might have a weapon and there is no de-escalation possible or as you said you can't access yours if you have one. I also think something like a stun gun or mace would probably be safer option than a knife to end a fight. People, especially under adrenaline, can keep going not even realizing they've been stabbed 50 times, and by that point you've added a much more ugly variable thrown into the mix (and it's also harder to grip somebody who is covered in blood)

That said always avoid fights or escape those circumstances if you can, and try to never be alone where fights might happen. And where there are fights, like serious fights with someone trying to do you harm, be as unfair and brutal as you can immediately.