One option you have is to import your organized files into Immich through the immich-cli. That will make sure it ends up in the intended file structure.

Before getting Sponsorblock, I would always manually skip forward past the integrated advertisements. This tool does the exact same thing but faster and more convenient for me. My conscience is unaffected