No offence but I doubt he will even use a sword again for this arc. He is done with it. He kinda had his TB moment once again and it's gone from the look of it. Luffy's opponent is Big Mom in this arc, not really Kaido. Oda is indeed ending One Piece in this decade and I don't expect Elbaf to be too long.
![](https://vignette.wikia.nocookie.net/onepiece/images/3/3d/Nidai_Kitetsu_Shonen_Jump_17_2019.png/revision/latest?cb=20190321085332&path-prefix=fr)
![](https://pbs.twimg.com/media/EZ7T34BXkAAoImk.jpg)
![](https://i2.wp.com/www.otaquest.com/wp-content/uploads/2020/08/vol-96.png?fit=640%2C351&ssl=1)
![](https://pm1.narvii.com/6628/ae89810919781b8e3bc89de0e4dd9efd51c138e8_hq.jpg)
Honestly it sounds like the kind of unexpected twist Oda would do tbh.