Hmm hard to tell
My favored scenario is AFTER
But, Zoro said "If I don't become World's strongest swordsman, you'd be in a dilimma" to Luffy makes me feel like Luffy will require him to become WSS in order to help him in his path to become pirate king
But who knows, hard to say