Watch 7 Sleep Tracking

As some of you are painfully aware, sleep traking on Watch 7 can be unreliable. I've noticed that if I've fallen asleep listening to something with my earphones, it won't seem to register sleep until after what I've been listening to has ended and it thinks nothing is playing. Obviously when I'm tired, I'll fall asleep part way through a long video. I have my phone screen locked as I don't want the light, but I'll still listen to stuff. Has anyone else noticed this? Is there any way to improve the sleep tracking? I've had my watch 14 days now and it's still really unreliable. I've checked that I'm wearing the watch in the right position and tightness. I've seen about resetting and clearing cache or using a silicone watch band. But I thought I'd ask if there's any other ways to improve the sleep tracking.

Tl;dr sleep tracking is missing the first hour or two of my sleep, especially if I've been listening to something. I'm wearing the watch correctly and have sleep mode turned on. Any suggestions on how to improve?