I don't actually know the answer to your question. However, I don't think the view of Wishes from CG is worth going back for. Unless I happen to be in the restaurant at the time of Wishes, I would much rather watch Wishes from MSUSA if I plan on being in MK that day or the Poly beach. The observation deck can be really crowded (sometimes feeling more crowded than MSUSA feels, due to the limited space), it can be chilly/windy and it just isn't worth the hastle of returning to CR in hopes of being allowed up.
On another note, I would call and see if the Napa room will still be there after the refurb. I am sure it will be, but you never know. While you are only considering it at the moment, it might be good to know it will still be there opposed to having your heart set on it and for whatever reason they decided to get rid of it.
