In the end Luffy didn't remove Yamato's handcuffs, the flying 6 will be Luffy's and Yamato's warmup fights now... Wano just feels great right now.
I already write my though how Oda could handle the situation:
Ulti and Pageone rematch vs Luffy(probably this time with G4)
Who´s Who vs Yamato
I have the feeling that Who´s Who get his chance to captured Yamato, Oda didn´t build the whole F6 vs Calamity thing for no reason, I can see Who´s Who taking Yamato with him and bringing her to Kaido.