I dig that, the question though, is it strange you don’t see BB-8 until the shuttle?
I’ve cut the phasma fight as well and one can very easily assume that as they run for the shuttle that BB-8 rejoins them. One could even cut them running to the shuttle and make their arrival on Crait even more of an surprise but I’m still debating whether to implement that.