As always, your plans sound like so much fun! How fun to be celebrating TWO birthdays at Disney! I'd love to do Disney for my birthday, but it's in July, and I won't consider going in that heat!!
Definitely definitely DEFINITELY Goofy's Candy Company is a must-do in DTD! I vote for a make your own treat, they're fun! (I like to go at a really random off-hour when it's not crowded there, that store is REALLY chaotic when it gets busy. What I did last time was we got our treat before dinner, and just carried the bag around. There was no line when we went, but when we wandered back that way after dinner, the store was PACKED.)