I'm actually working on new Autofight code myself (with geever's help), the present code is VERY quick-and-dirty and doesn't take into account the factors it should.
My replacement code will take some time though, and I can't guarantee it will be in 2.4, but I'll do what I can.