Auto shot workarounds - S40

Like many others, auto shot doesn’t seem to work consistently.  Almost never on my drives. 

I see that Garmin is working to try to resolve, but has anyone figured out work arounds to get the watch to record more shots?  Specifically, do you do anything to get the watch to recognize your drive after you have hit when it doesn’t automatically?  

pretty frustrating.  

Paul