Borsalino's opponent from the Strawhat crew is Zoro not Sanji. There are a few reasons to expect this to be the case:
Borsalino used a sword in his only serious fight against another top tier
He has a named techniques for creating said sword "Ame no Murakamo".
Said sword is one of Japan's...