Yea, the shadow of death was put upon Shanks the moment Oda foreshadowed another clash between he and Blackbeard during the closing moments of Marineford. He's hitting us right in the face with it, but I don't think it'll be a total wash though like some people fear. Shanks is a Yonko after all and Oda has yet to give him (nor his crew for that matter) a chance to show their true capabilities , aside from word of mouth and a lot of flexing during crucial turning points in the series and at it's inception from Luffy's initial origin about how he got his Hat.
For that matter , that's why I don't think it's likely Jinbe meets his demise at this point in the story at Whole Cake or any other for that matter during the series, he will be a Strawhat Pirate. Not an ally or honorary member like Vivi, (who herself may have a chance to rejoin depending on how The Reverie arc shapes up) because quite frankly it wouldn't serve any narrative purpose in the story that Ace's didn't already serve. Just go down the list and you'll see what I mean, Ace's death gave Luffy a taste of the strength level of a Yonko and Top tier Pirates he'll be dealing with in the New World and the psycho mentality Marines have towards those infamy Pirates compared to the what now seems like Stormtrooper fodder from Paradise's perspective. Plus it gave him his first real taste of complete and utter defeat that surpassed that of what happened on Sabaody imo.
That's check, check and check. Plus like Mario says, there's no way Luffy will full on try to take down Shanks at most they'll all spar (SHs vs RHs) on a testing ones abilities and and mentality gained up to have reached their point of this wild sea level, to see if they're really worthy to grace Raftel but I honestly never got the inclination Luffy and Shanks would ever really fight. (Just look whats happening with Mihawk and Zoro these days)
Also just to get back on topic I know people think he's below it or something but more and more I'm assuming Jinbe will simply be the Helmsmen of the Strawhats. Because unlike the others there hasn't been an emphasis on particular need to be filled aside from the brief or various , however subtle trouble the crew has had manning or steering the Sunny since the timeskip whether Franky be preoccupied or conveniently absent. Plus Jinbe's dream doesn't necessarily align with a crew position as well as some of the others, his is more about an ideology and social agenda. (But Ive seen some very convincing theories about Joy Boy , the promised day/Madam Shirley's vision and Noah)
To go even deeper this brings Nami's own arc kind of full circle along with Jinbe's himself, as he feels responsible for her childhood nightmares due to letting Arlong run loose, while she who wants to sail while making a Map of the world will now be steered to said destinations by the most honorable and good hearted Fishman of them all.