Sounds like you've got it sorted.
But others might be looking for recommendations too and I wondered if the queues at the Tower of London (to get in and then to see the Crown Jewels) were as long as when I used to go with our visitors 50 years ago. They had signs at points in the queue estimating the time you would wait.