I’m glad that you will get to experience Dinosaur before it is gone for good. It’s a shame that you couldn’t visit it when it first opened as “Countdown to Extinction“ Now it is just a shell of its former self.
Also, for your Epcot day you make no mention of Soarin or Gardians of the Galaxy...