Shanks and Kid won't fight. If Oda wanted for that to happen he would've started with it without wasting time on Rockstar delivering a message and so on. Imo they will have a deal and part ways or something like that.
The local giants seem to be fond of Shanks, they will be on his side too. Law, for example, decided to fight because BB's crew and BB himself have a weakness on the open sea, he wasn't delusional, but smart. Kid had to be very stupid to try and fight Shanks on Elbaf, again. He'll just lose his second arm that way, nothing else.