I prefer battlemaster over champion also, but not just for damage or control of when you can apply the damage vs hoping for a random crit, but because of the effects of battlemaster dice. Sometimes a well place push or trip can swing an entire fight, things like that make all the difference to me.