I'm still sticking with Pizarro as Sanji's opponent. Getting damaged and being expressive with his pain (being a whole island that's susceptible to harm to his external structure) just makes it more clear to me he'll face Sanji.
Queen was out there screaming and bleeding after that Chopper slap, besst believe Oda has no issue making Sanji's opponent get hurt and expressing pain even though they can still manage to fight afterwards just fine.
Pizarro was one of the biggest issues on the island and not just due to his size. San Juan Wolf got chucked off-panel, meanwhile both Garp and Koby are busting out large-scale attacks for Avalo and he's still up. Broken bones or not, he's durable and resilient. Fitting Sanji opponent. Aramaki comes after.
I think Oda's doing well by showing us the Blackbeard Pirates in battle before the crew takes them on, they're not like the groups the crew has faced prior, they should be the most built-up to opponents considering the stage of the story.