So I called the Willard again.. and she mentioned that she saw my Ambassador membership number in the reservation and that the guest services department will take care of the upgrade the morning of arrival. They will not automatically bump me up right now..but that it's _almost_ guaranteed on the day of arrival. So, we'll see what happens! Thanks for all your help.