How about this for a compromise:
The feathers with weapons are split into two heats as normal and all the non weapon feathers names are put into a hat.
The first six or eight drawn out are split into two groups with three or four going into each heat.
This way boxes get a chance to compete but you don't end up with fights dominated by them.
What say you guys?
Mike.