Michael, I remember that article.
If that is the case, then Jonathan Archer would beat both of them as he'd shoot first. He'd be annoyed that Scotty beamed Porthos into the ether.
I'm not sure I'd call Q a villain but rather an adversary and occasionally an ally. In the end, he always seemed to be on his own side against everyone else but he had a soft spot for Picard and Riker. He did help Picard save humanity against the wishes of the other Q, who wanted the human race eradicated. Maybe Baby Q mellowed him.
If you want a villain that seriously challenged them, I'd pick the Dominion and the Borg.