Clip Sport Songs Order & Album Mix-ups

Hi All - I just got my Clips sport and have upgraded to 1.17 firmware. I cant beleive how much trouble I’m trying to get it to play songs in order.

I drag over an album from itunes into the clip Music folder. The album which has three disc (CD’s) and each disc has around 20 songs. The file names show up in the clip folder as: 

1-01 Song1.mp3

1-02 Song2.mp3

1-03 Song3.mp3

etc

with the next album showing up as 

2-01 Song1.mp3

2-02 Song2.mp3

etc

All songs have correct tags assigned (via itunes).

However when I trying to play them on the clip via Music / Album it shows them in a weird order:

Disc 1 - Song 1

Disc 2 - Song 1

Disc 1 - Song 2

Disc 2 - Song 2

etc

How the hell can I get the clip sport to play all disc 1 songs in order then move onto disc 2?

I wish I just bought a **bleep** ipod nano!