Approach S42 + CT10 - Sensors getting stuck on one club, not deactivating

I saw this thread from a few months ago, but wanted to add my experience here because I have an S42 instead of an S40.

I have the sensors on my wedges and putter. Occasionally the watch will just get stuck on a particular club (lately it's been either my putter or SW). Once it is stuck, that club will constantly display on the watch. I also stop getting club prompts for subsequent shots with clubs lacking a sensor (like my drive on the next tee box). Other clubs with sensors either just don't register on the watch when in hand, or the watch will show (X2) indicating that more than one sensor is active.

It seems that shots are sometimes still mapped, but without club data as the user in the linked thread mentioned. I've also experienced that sometimes shots are missed, because several times during my last round the starting position of my drive was missed. It would somehow pick up on the second shot, but again without designating a club. Once it gets stuck, I try to "add last shot" on the watch from my location, but I don't know if that actually does anything...and it kind of defeats the purpose of the sensors. 

I haven't yet tried the steps outlined in the linked thread for resetting/re-pairing the sensors. I will do that the next chance I get, but was curious if there was a way to mitigate this mid-round. Frankly, doing all those resets while out playing is not an acceptable solution because you have to keep moving. When this situation arises, it would be way easier to just not have the sensors at all...at least then they wouldn't be interfering with the club prompt after a shot.

Was hoping that there might have been an update since the last response to this sort of problem.