Yes, I think it's on the way. I have about 200gb of music. So what I've done, is spread it across different cards, set up for different genres. That cuts searching a bit. I also have cards with different mixes. Sounds a bit ocd, but it helps with so many files.
I do agree, the lack of search is a pain, but that could well be on the way.