You are making excellent progress !! Always best to avoid having confusing duplicates on your player.
I like to test out my Clip Sport experiments using a few albums at a time.
2-digit track numbers should produce your desired play sequence in Music Mode.
The order you sort folders & files in Win Explorer and then copy to your player will be best for Folder Mode.
Let us us know your progress