I think the writers screwed up the Borg when they added the queen.
They would be a much better antagonist if they they remained just a collective as they would be a dark mirror of the federation, by having unity and collectivism without diversity and freedom, and could complement the Ferengi, which could have been the federation's dark mirror with superficial level freedom marred by hyper-indivualism.