We queued twice from the entrance and both times it was a 2 hour wait. I do feel they could have operated it a bit faster but it was pretty good considering the ride team haven't ran it with guests for over a year.
The queue also moved almost constantly (even faster with no RAP/Fastrack being merged in) which made it seem like you weren't waiting that long, and the views of the ride helped pass the time too.
Our 3rd attempt to queue was for a night ride, which included the infamous stoppage and confusing communication. This time from the top of the stairs inside the entrance we queued 2hrs 25mins, including the roughly 60 minute stoppage. Granted a lot of people in front of us left the queue during that time though.