I completely understand the pull of your favorite resort. Can you do a split?
I feel that with all the construction, obstructed views, closed spa, walls that are up, the pool area rehab, possible QS rehab, etc... your old friend, the GF, might not seem the same then. I feel there might be so many distractions and possible monorail interruptions again that it might detract from your overall enjoyment.
All of the WL rooms will be like new for your visit. Remember the rocking chair view photo you posted during your last trip? That could be in you in January! So peaceful and tranquil and just perfect weather for leisurely walks to FW and sitting in front of a cozy fireplace posting to the DIS
I think it's time for you to book WL and see what you've been missing - you will love the Old Faithful Club and you'll feel relaxed and happy every time you look out at Bay Lake and the geyser and sit in a cozy leather sofa or overstuffed chair