@acdha I discovered that 11 months ago AWS added "drift-aware change sets". Another 15 years and CF will have feature parity with terraform!
Last time I got stuck in UPDATE_ROLLBACK_FAILED it was a ticket to AWS to figure out how to get it out of that state. They were really good at it, like they had practice.