I am sticking with YC GV for 12 nights. We should be checking in a few days after you leave. I did upgrade to CL, but that only lasted about 2 hours. I don't want to go overboard on spending this trip since we're going back in September. September with 40% off is a pretty sweet deal...I can't say much for Sept weather.
I don't see any changes except maybe reducing it to 10 nights and spending a couple nights at a new resort. I would love to try GF, SSR or maybe just a couple of nights at AKL or CSR.
I think YC is great choice for you. I wouldn't stress over the CL. CL at YC is not as good as WL. I would think long and hard about spending the extra money on YC CL. I think you will really enjoy the location, the pool, and dinners at Epcot. The free concerts during the F&G can be entertaining. The Boardwalk at night is also fun. I think you made a great choice, but will it stick.