First off Congratulations!!!
I personally would stick with the GF and BC (DH and I are doing this in 13 days). Its nice to stay at different resort areas - having access to the monorail is great, and then being able to walk into Epcot from the BC is wonderful.
Also, Citricos at the GF is...