When we went, we are unable to swap right before/after riding. They did let us walk through the line together, but DH and baby had to go wait by the exit and DH was given a fastpass to go back through. Unfortunately it took us over 20 minutes to go through the fastpass return line the first time around, so he chose not to go back.