I quite like the changes proposed here.
But yes, focusing cleave damage around D&D is pretty dumb, I agree.