One more thing expect the Luffy ran out of haki plotline to be the true one.
Luffy was already awake by the time he hit the ocean meaning he was out for seconds which would be high unlikely if it were due to some monstruos attack from Kaido.
He is already talking to Momo which indicates this.