He's a swordsman, so it'd kinda make sense for Zoro to fight him. Then again, the whole love thing and him being defeated by Sanji parallel might suggest he'll be defeated by Sanji to reinforce the symbolism.
I still think Zoro and Sanji vs Dorry and Broggy makes the most sense. The HKs might serve as hypetools for Loki.