Scan recursively is probably the best choice. If you select “Movies in separate folders” I don’t think Kodi will find the movies not in folders. It’s best to pick one method of storage and stick with it, but I think the recursive scan will catch everything.
Kodi’s wiki covers the explanation of these settings. Movies in folders is regarding where it decides to discover the content matching from, not where it is looking for files to match for.