I do think it's also worth keeping in mind that this year has been pretty wonky in terms of refurbs. Things are added to the refurb list, then removed or have the dates changed. The list here, the one on MousePlanet, and even the
Disneyland hotline give you the best information available, but it's subject to change with no notice (which it has been doing this year). In other words, until the ride actually shuts down, it's hard to say for sure that the refurb will happen as posted.