Happily I have an update.
I received an email from the hotel's Front Office Director. He seemed genuinely interested in investigating the issues and making the situation right. I was told I would be getting a credit to my credit card for both nights of my stay. It was good to see my issues addressed promptly.