Upgrades at CY's are tough because they rarely have anything to upgrade you TO - they only have a few suites (which are often booked by a paying guest). I have been upgraded a few times, but certainly never count on it. I suppose the spa room could be considered an upgrade.....but quite honestly, I am not certain I would even notice! An upgrade to me would be a free breakfast for at least a day or so of my stay. (but this is also rare)

I think the bigger issue here is the check in/check out thing - especially if you are staying at this CY repeatedly. They didn't upgrade you; they didn't have the basic room you booked available! I have never been asked to move once I was in a room; and it would be totally unacceptable to me. As SkiAdcock said, I would nicely ask for a GM, let them know about the situation and your repeat biz; and see what happens. If nothing does, I would suggest looking at other Marriott properties nearby.