Too into the music (metadata)

So I am a very lucky boy, and kind generous wife (who has just made the most amazing muffins by the way) bought me an MP3 player for Christmas. And knowing what an utter anti nasty software paranoid freak I am she buys me one of these . It's brilliant. And it plays Ogg vorbis files. These are like MP3 in that they are compressed music files, but often they are better quality. Ah quality- so often a secondary, tertiary, or, lets face it, a completely ignored consideration in modern broadcast. Crunchy talk shows, squished classical, fizzy jazz, and that's just Radio! So in a curious mix of neo ludite harking for a quality past, allied with a pseudo-geeky need to try and get this device to have very cool open source support, I eventually set myself up with this software to get music off CDs, and this software to turn it into very nice Ogg files. Took a little time to get it all set up, then the next question is- what do I call the files.....?

Cue massive wracking of brain- what do I want to see on screen? Will it be whole albums? Tracks? will I navigate via a menu or just shuffle? Where is the metadata coming from? What will I use ot for? How long will it last? Will I change the use? Panic! Worry! Confusion! Insomnia! (Ok it was christmas and I over ate. A bit. Bt I swaer soe of the insomnia really was down to an inability to commit to a metadata schema for my new MP3 player!

I am so sad.

Anyway I have tried a couple of schemes, and neither is really perfect.
For whole albums I do a directory structure of artist/album/tracks and I name the tracks as:
Track Number- Track name dot ogg.
For ripped tracks I just put them all under the artist, and then put:
Track Name- Album Name (track number) dot ogg.

Excpet I'm not even being consistent in these applications (I ripped the whole Yo La Tengo album in the individual track schema as an experiement and it is more useful, except the album name is so long that it takes over a minute to scroll across the screen)(good album mind).

Any advice on good track naming schema for small screen mp3 player usage gratefully recieved.