Not sure if this helps you, but I put everything into my file system under their 'artist in MB' name, but tag them with their 'as credited' name.
Because Foobar2000 searches both tags and filenames, both searches are useful.
Foobar also let's you browse by file system so they're grouped in there as well, but play as credited.
If you use a player that relies on tags exclusively that wont help though.
And I'm not sure what you can use to sort by one tag, and then the other, interchangeably. You can obviously set both tags but only one can be the 'track artist' tag - perhaps one tag for album artist and one for track artist? That might work.