Is there an alternative to iTunes for larger song collections?

It is obvioius that Apple doesn't intend to improve the woefully inadequate way that the iTunes database manages song files in the music folder. You can either let iTunes manage a collection, in which case there is a jumble of incoherent files, or you can manage it yourself and lose the ability to readily move your collection to a new drive as you outgrow the old one. I have 30,000 songs, now mostly as Apple Lossless, and having now moved them to a 1 TB drive, iTunes has lost its link to thousands of them which will require replacement. It is a shame because iTunes does a wonderful job of managing playlists.

(One thing I notice about the delinked song files is that it is largely connected to their size. In general, the large the file the more likely iTunes is to lose the file. With 192K MP3 files it seems to happen when they reach about 8 minutes, and, of course, the Apple Lossless files are are large, so most of them are now lost to iTunes.)

Is there any other product that does a smarter job of managing collections?