I think that they should move the queueline around so you dont queue the whole way.
Its been a long time since I've seen anyone queue the whole spiral. During quieter times, they should open the stairs that go up, or create a shortcut.
As for the ride, I think they should maybe put a tunnel over the exit of the tunnel, just to extend the darkness ever so slightly. As soon as you enter the tunnel, you can see the light at the end of it. If they extend the tunnel to end at the brake run, it would make the experience that little bit scarier.
I also like the idea of putting a funnel over the hole with water flowing into the tunnel to make it look like you are entering a water ride