I had the same problm and was going to dal with it, but decided to be lazy and just use random.
Do the tracks that are sorted by name have the correct track number? If not you will probably need to change the ID3 tags on each one does. That would be a fun job.
If they do, you might get away with - assuming you're using windows - just using the View>Arrange Icons by>Track Number. Either in your my music folder, or maybe try exploring my music and selecting all the folders.
