Normally I hate when posters suggest disputing cc charges when it's best handled by the vendor's Customer Service.
In this case, however, the OP was overcharged for a massage plus he was overcharged for meals. He has an email from the hotel offering a 20% discount, so he even has proof of the latter. If he's still within the window for disputing the charge, that's what I'd do.