While I do enjoy a good shuffle from time to time. And your reasons for enjoying it resonate with me pretty strongly. I especially love to get surprised with deep cuts in my collection that I'd totally forgotten about.

But my main bugbear with shuffle is that I can't stand it where segues get cut-off.
Which happens not only with tons of studio albums, but with just about every live release ever. Or the situation where they track banter announcing the next song at the end of the previous song.
And I know you can edit that yourself, but I do not have the patience to do that with my entire collection. Have you taken the time to do that for your collection? or do you just accept that as the necessary evil of using shuffle?