Possible, but we sort of have to know Drakes motivation first. He won't reveal his real intentions so I wonder if he's willing to fight a Calamity. If Queen headed back into the mansion, then I have less of a reason to believe it since he's stuck on the performance floor.
Like look at Robin/Brook. Oda intentionally had them go into the mansion late to save Sanji. We saw that chapters before. If Queen isn't fighting Marco and is back in the mansion, I just don't see motivation for him going there. Yamato (vs Jack) would be a different story because there is motivation through Momo to save the scabbards and potentially that 10th person