Obviously Zoro will be WSS but I don’t think his epithet will change. Maybe he gets another one to accompany it.
Sanji’s epithet is more iconic than Zoro’s so it isn’t going anywhere. He might get another additional one at the end of the series, maybe something related to the All Blue!