I am waiting for Oda to first complete the matter regarding Bonney and Kuma, before I think he will tackle the matter of Lucci, Shaka and Vegapunk. Because, if you think about it - Oda has not really dived into Vegapunk's past, yet. And I think this will be the part, in which he also explains, what happened during the time-skip and what Shaka looks like underneath that helmet.
And Oda also said in his Festa-letter for 2024 that the fight between that person and that person will finally happen. "And finally, it will happen. The battle between that character and that character will lead to unexpected results!!" That means that the fight will happen in the next year, not this. Honestly, I think this fight will happen either between Lucci and Saturn or Lucci and Kizaru, whereas the latter is in my opinion more likeable.
Let's wait until the SHPs and Vegapunk & Co. have almost left, then I think we will see a big surprise.