

A bit cumbersome if you are traveling and using a different public wifi every time though
You’re not wrong. But you’re probably also familiar with the “secure vs. convenient” dichotomy: the closer to the “secure” end of the spectrum you get, the more cumbersome things will inevitably get. If you feel like you’re jumping through too many hoops and you don’t know what for, chances are you’re overshooting the target in terms of your threat model and might get away with doing less.

Probably folder structure and naming conventions.
If you still have some stubborn pieces of media, [imdbid-tt…] tags and even .nfo files can help.