There's an app I use, Virtual Shuffle, that forces Spotify to shuffle properly https://shuffle.virock.org