I think with those at deluxe resorts there really isn’t anything that can be seen as an upgrade. Again, I think saying Disney is upgrading is a misconception, IMO. They are moving from closed to open vs, canceling,
Your case from CL to non CL is just wrong...that should be credited first and then moved...but, it does seem from the few reports we have had that they are trying to move deluxe to DVC in same areas.
But, other than OKW, RIV or renovated SSR, even 1 bedrooms are going to give you a sleeper sofa as the main 2nd bed,
I am still hoping we hear in the next few days when they may open a few more resorts.