I certainly wouldn't wait until check out. I'd probably try to get it sorted out now. Also, are they legally allowed to add fees & change cancels after the original reservation/confirmation? I'd fight this one (but keep in mind if you stay there next you you then would know the policy). You might want to email or PM the Marriott concierge to see if Marie/Ira/Drew can help.
Cheers.