Just an FYI that the new server version in the beta channel (v 1.19.1.2589), which was just released, has a new option under Settings > Library

Turning this off appears to correct the repeating tracks issues when shuffling. I have executed half a dozen shuffles and the same tracks are not showing up the same on any of these runs.
Edit: previously I did have the same 3-4 tracks each time I shuffled (which was probably some remaining “popular” tracks) and when skipping them then I had a proper shuffle.