Dump BC for sure. This isn’t a small construction project that can be ignored, it’s so big it’s even noticeable from the boat on the water because of how big the scrims are. It won’t feel like what you love.
Now, what are you after? As close to BC as it can be? That’s BWI. Saving some money because if you can’t have what you know you love maybe bank $1k for another time when you can? That’s POR. You’re basically familiar with the benefits of BWI because of your BC history, main differences to me were the walk to EP is a bit longer, QS situation is sad & TS only accessible via outside (it rained a lot when I did BWI a couple Mays back).
If you aren’t dedicated to the Disney Bubble I’d consider Swolphin to save money but be in EP area if there is availability at decent rates. Swan just finished a beautiful remodel and they have an awesome pool complex shared by all the hotels at Dolphin.