Approach S50 System Update

I just got my approach a couple months ago. At that time I setup my clubs, added my courses, and was using club tracking with high success. Loved it.

The watch was updated a few days ago. I went to play a round of golf and all my clubs were gone (just a standard list shown). Club tracking worked just fine despite the wrong clubs listed.  I finished the round and ended up using the app to connect, sync, and try to fix my clubs list.

I went out for another round the next day and my clubs are in the list now! But this time, the watch mostly failed to track clubs. I rarely asked me what club I hit.

Since the new update I'm not feeling confident with my watch.

Before I go play another round, is there anything I could do to guarantee my clubs are listed AND club tracking works like before the update?

-Thanks