Probably he is done, maybe he can pull some sucker punch later if Drake leaves to fight Kaido too. Anyway first I would also wamt to see what Oda does with Orochi (if Orochi still does something in this arc them there are higher chances Apoo will act too).