If I was conditioning for fighting I would go into the forest and kick my shins, feet against trees, punch, elbow bark etc. As well as punching my own face to toughen it.
Also change the focus to core, Bruce lee said something like if you don't have a really solid core you shouldn't be fighting.