I'd go for the 2BR. It shouldn't be substantially different to get to CR from SSR as opposed to WL (there is a boat at WL that heads to CR, but it doesn't come as often as boats to MK). Allow extra time for travel due to the holiday firework, though, as they alter routes and shift parking to accommodate the huge crowds. We've run into some issues during that time driving ourselves; however, buses are generally given better routes since people still rely on those to get around the World. Moreover, at SSR, you can potentially walk over to DS on the 5th which is extremely convenient.