I called Marriott customer service, she called the hotel, again nothing much they can do, didn't offer to move me to another hotel, didn't offer any points or credit. I was very polite and calm during the call, so I don't know if that helped or hurt the situation.
So after calling the front desk person again, they are going to call my cell phone tomorrow when they have a room ready, and I have to leave work to move my items before 3:00. I would guess 99% chance that it is the same room type or smaller.