Plans sound good to me. You will absolutely love afternoon tea at GF. Mom, who recently died, and I made it our one special thing to do together. It makes for a very peaceful and different experience to do at WDW. We always loved walking through the the GF atrium and lobby as well.