Playing Music Saved on Watch

Prior to WatchOS 10, it was easy to shuffle music saved on the watch. You simply opened the Now Playing app in the watch, tapped the watch, then hit play. If something was already in the queue, you just force quit that or Podcasts/Music apps, then reopen it, and hit play on the empty queue. It would automatically start a shuffled playback of all music saved into the watch (through the Watch app on the phone). This worked in every WatchOS going back many years.

Now, with WatchOS 10.0.1, this doesn't work. I still have the same music saved on the watch, but pressing play in the watch pane for Now Playing does nothing 9 out of 10 times. Every so often, it starts playing as it did before, but playback stops after a few minutes (playing to AirPods) and the queue is erased. If you tap the AirPods to resume playback, it plays from...somewhere. I seems to be streaming my full music library, not playing locally, or from what's stored in the watch. The Music app in the watch only shows the Apple Music interface and my Music library in iCloud. I cannot find the set of what's deliberately saved in the watch.

All I want to do is play the music stored in my watch, all shuffled, in a couple taps, without it stopping randomly. Any suggestions? Thanks.