Great, glad to be helpful.What's funny is I was playing around with my plan some more this morning, and it looks pretty similar to this suggestion of yours. You're right, I think we're going to skip Rafiki only because of the time commitment. If we want to add it I'm thinking we'd have to remove something in its place? This is the plan I came up with this morning;
RD - Safari
Pangani
Discovery Trails
Snack at Tamu Tamu
FoLK - 10:00 FP #1
Safari FP #2
Meet Pocahontas
Maharajah Jungle Trek
Flights of Wonder @ 11:45
Lunch
Fossil Fun Games
TriceraTop Spin
Boneyard
Dance-a-palooza
Finding Nemo
EE (child swap)
Tough to be a bug (which we might not even do, depending on if DD will be scared)
Kali FP #3
Oasis
After comparing your suggestion to the list I had, I took your advice and moved Discovery Trail and TBBAB to PM. I'm very happy with this plan. As you said, it gives us some AM time for a snack, and to meet Pocahontas, and also gives us a bit of freedom in the PM in Dinoland depending on how long things take us there.
Thanks so much for your suggestions, I feel much better about our plan now! And won't be rushed to make FoW After FoLK in the morning either.
One more note -- I had FP#1 at the second safari, don't know if you noticed that. I really doubt you will need a FP for FOLK @ 10AM, even on an EMH day. I would so hate for those to be famous last words, but maybe other people would weigh in with their actual experiences or you could check on some of the sites -- I really think you could do this standby, especially since you won't be rushing there from something else. That would give you your third FP to use on EE with the rider swap. Just set it up so that if you head over after Nemo, you will catch the back end of your EE FP and the front end of the Kali one.
ETA: Also, remember that you can swap Jungle Trek & FoW in your plan above if you find you're running tight on time -- they are pretty close.
Have a great trip!