I just gave all the units with the 2 handed bug the janissary heavy infantry in export_descr_unit(as it is now the armour upgrade lines lower down that dictate the actual look of as unit), and they all work perfectly in combat now, plus the animation suits all the units with the bug quite well.