I would never forgive Oda if Luffy and Shanks never met. That would be the biggest bait and switch in anime history. It's one of the biggest reunions in One Piece.
They can meet as friends or they can meet as enemies. I don't care. As long as the story is good and they meet eventually then I'm good.