Yeah, like I said keep everything with Pai getting her armor on the ship and even her eating some of the chef's food. You could even just keep that entire post and just change up the ending dialogue a little bit. Just edit in what Pai did before getting on the ship including her talking to Mads for the first time on the elevator to the docks. Does that straighten things out for everyone?