First I would suggest you not wait for a surprise by Disney and suggest you call earlier to get your reservations adjusted as in as soon as possible at (407) 939-7630 or (407) 939-1936 .
Have you looked in
MDE to see if maybe you have already been moved?
Both reservations are for Deluxe lodgings so you will be moved to Deluxe lodgings. May be to an existing open Deluxe Hotel or DVC depending a dates of your visit and what inventory is available for those specific dates.
The CCV DVC a the WL is a good alternative to a regular WL room but since there is no CL offerings currently available you options for the AKL CL could be the AKL DVC but with some more limited dinning options vs other Deluxe resorts.
As an alternative to AKL CL you might consider YC, GF, or CR as options but again none will offer CL at this time and may not be available during your dates.
Dave