The todos look good - the hotels I'd re-think.

CM: While a stunning property, Four Seasons CM is in the middle of nowhere. Perhaps split your stay into a city property and that one.

BKK: The Peninsula and M-O are opposite each other. I would choose 2 very different properties for two consecutive trips - something more central for the start or the finish of your trip.

Have a nice time!