Yes, it sounds like you handled things very well. I agree with your attitude that these were not major items taken individually, but together they definitely impacted the enjoyment of your stay.

Unfortunately, the only problems I tend to have with Marriott are in this exact same category. Little things, that even one poster here chalked up to whining, but I guess I've come to expect a certain standard of service (dare I say excellence?) from Marriott. When it's not met, by a series of things that I just KNOW aren't right, I struggle with how to handle the situation.

Kudos to you for both your attitude and the way you handled things.