This message was deleted.

I ended up deleting the stack with

--disable-integrity-checking --force

set and then manually tidied up all the things in the AWS console. Not the easiest or neatest way to go about things, but it worked.