HomePod skipping tracks playing from Apple Music

When playing an album from Apple Music on HomePod - whether started by 'Hey Siri' or Airplay - the track shown as playing on my iPhone can be up to 30 seconds ahead of what is actually playing. So, for example, my iPhone could show that the next track is already playing whereas the current one hasn't finished. At some point it seems that the app on the iPhone recognises that the two are not in sync and makes a crude attempt to correct this by either skipping to the next track or stopping and restarting the current track. This makes for a rubbish user experience as my wife and I are constantly waiting for the music to be cut short - usually a track we are really enjoying. If there is a synchronisation issue the logical way to resolve it would be to correct what is displayed on the iPhone not interrupt the music. If this is too hard then dispense with view on the iPhone - we can always Shazam it if we don't recognise it. We have both the original HomePod and HomePod mini and both are affected. Has anyone found a way round this?