It is way too soon to have Shanks appear again when we already had him in Wano and "vs Kidd" so probably it is just Dory and Broggy who come to Egghead to get/help Luffy or something like that. They will most likely be the link to bring Luffy to Elbaf after Egghead, I don't think they will get big fights or screen time here in Elbaf, at best some hype by demolishing some vice admiral.