I don't know whether the BS5's mots does or does not work with wav-files, but why not make all your wav-files into lossless files?
That way you will be able to tag them much better, and you will have an album collection taking up approximately 60 percent of your wav-collection.
Edit:
And lossless is, of course, lossless 