I believe (but could be wrong), the 2,000 limit is a DLNA limitation. I tend not to save playlists so it is not a biggie for me. There's an easy work around. Just copy the files in a new folder. I'm not sure about limitation on the number of songs/files per album (folder) but then one can also tag the folder files using something like MP3 tag and define a new album (e.g. 'my 2nd favorite playlist').