I think there's a blurred line between who's considered a swordman or not, so I just follow Oda's words and the characters' own words to determine who's Swordman or not
So these guys
Are swordmen.
While this doesn't neccessarily mean that Mihawk is stronger than Roger
It opens up the possibility that Zoro might reach or surpass Roger's level by EOS
Both swordmen with AdvCOC