Not sure about pairings and how Oda will handle that but Laugh Tale was most likely always the plan, staff has confirmed the name was in place for a long time and it fits with the main drive of writing a joyful story of pirates and the last line of Bink's sake talks about a ''funny tale/laughing tale''.
Oda also isn't shy about admitting things aren't ALL according to keikaku like the fandom often jokes and earnestly thinks at times like when he revealed the ending of Chopper's arc with the Sakura snow was completely fortuitous and a late addition despite how well it fit.
Well, talking about Laugh Tale isn't it should have theme related to God Valley?! Like litteraly we got everything connected to the " God" including Marijoa, Noa, Devil Fruit, Adam, Eeve, God Valey and then it's appears that Raft-El,(God's raft) that it should be turned into Laugh Tale. Time will show if I'm right, but there is possibility that "creators" of OP changed even that.