Queen is still a swordsman even though he's a cybernetically enhanced ancient dinosaur, capable of shooting lasers and could knock out Olin without the usage of said weapon.
Pica was a literal walking mountain capable of using FBH, but he was still a swordsman.
Kaku was a trained assassin since birth, equiped with the 6 powers and possessing a zoan df, and was still a swordsman.
Ohm was a swordsman even though his own "sword" was a shape-shifting cloud capable of taking any form to his liking.
Daz labelled himself as an assassin, but Zoro saw him fit enough to take the label of swordsman.
Cabaji was a clown riding a bicycle using petty tricks, yet he was still a swordsman.
Roger himself is a swordsman until he's shown or stated to be otherwise.
Shanks has nothing but his Sword and Haki similarly to Zoro (the mofo protag) , but he's not a swordsman. Good one.
:cheers: