Instead of saving full albums to your saved tracks, save only the very favorite tracks, and add the albums as playlists instead.

I have a playlist folder called "favorite albums" specifically for this.