Can you fix our existing Tag Manager container?

Yes. We audit what is there, remove duplicate or broken tags, rename things so they make sense and rebuild where needed. Changes are tested before publishing, and previous versions are kept so anything can be rolled back.