My only tip for the big HP rides is that if it is not an issue for you and DS, go in the single rider line...you will be split up by one or two cars but it moves much faster...we did that with DD and after a first ride that we did together, when we redid them for a second or third time she was OK to be alone in the car. (Age approx 8 at the time). You only split up at the last second as you climb into the ride and then the first person has to wait at the end for the second to disembark, so I would go in front.
