What about something like dynamic flow which could drastically reduce wait times?
Sort of similar to touring plans, but everyone is on it. Basically you put in what you want to do for the day and it tells you on the fly the next attraction on your list you should go to and you have the choice...