If you look in Now Playing preferences, there's an option to shuffle by album, and to shuffle tracks within an album. If that doesn't work for you, you might try "Clear list and play album only" under Play Now settings, combined with regular shuffle.