Cloudformation Accidentally change bucket name

Hi, I have a Cloudformation template, which creates a couple of resources, an IAM user, an access key, roles and an S3 bucket.

I re-used the same template to create another bucket and ran the command from the CLI. I, however, neglected to update the "--stack-name" parameter, and the update started taking place on the existing stack and not a new one.

The new stack has a new value for the bucket name, and went ahead and created a new bucket, then attempted to delete the old bucket, which contains data, so it could not be deleted. I can, however now not roll back to a state where it will use the existing bucket name, to enable me to manage the original stack anymore.

I have done a test run by creating a bucket and then importing that into a test stack. This works for the import, however once imported, it does not allow me to make any changes to the import bucket. A current setting on the bucket is

      ObjectLockEnabled: true
      VersioningConfiguration:
        Status: Enabled

If I have this option in the cloudformation template, it requires replacement. Yet the setting is currently in place already, I just need the template to match what is in place.

Any advice?