[@The Spectre] These are some awesome suggestions, thanks!! We've got park hopper passes, so will be dropping in on California Adventure too -- will look out for those rides, and will bring water! :D