Yes
Pure swordsman vs pure swordsman
Pica (DF power + sword)
King (DF power + sword),
Shiryu (DF power + sword)
Kizaru/Fujitora/Greenbull (most likely to the least likely WG arc opponent)
Ghandi (might not have a DF but still, the one with the title & black blade will be after him)
Mihawk
Maybe some sparring sessions with Shanks before Shiryu
His last proper 1v1 fight of preskip was against Ryuma, another pure swordsman with a black blade.