If they're going to bring back the Borg, they need to be treated with respect. If they're supposed to be so fearsome, the writing needs to validate that idea, not undercut it.
Starfleet cannot be allowed to beat them except under very unusual circumstances, ie, the writers come up with a way for Starfleet to be astonishingly clever about it. And even then, this should happen rarely.
And assimilation is P E R M A M E N T. No more go-backs, no wiggle room. Allowing characters to be de-Borged just because they are main characters really undercuts the Borg's credibility.
And NO QUEEN!
Yeah that just about covers it.