One neat plan might be to examine the tags, and not do the crossfade if it's playing two consecutive tracks (as determined by track-number tag) from the same album (as determined by album tag) -- whether in shuffle mode or not.

This isn't perfect (if it's a compilation album, you might want adjacent songs cross-faded) but it's good enough to think about implementing...

Peter