Wrong event assigned to race

I ran into a very annoying bug in Garmin Connect last week:

I ran a race, that I had added as a event in my calendar, and when I finished the race, my watch (Fenix 7 Pro) correctly asked "Was this race A?", and I answered yes, and it was shown as "Race A". And if I in the watch go to "Race A", it shows the time from that activity.

But on my phone, in Garmin Connect, this was instead registered as "Race B", which is in 8 weeks, and is a 10k instead of a 5k. So the activity was not registered as a PB for the distance, and got the wrong title.

I could correct the title, and I could change which event it was associated with in connect (edit -> type of activity -> race -> pick event). But even when I change it to "race A", it does not register as a PB, presumable because it still somehow sees it as a DNF on a 10k race.

Some background to the setup of the events, if that's relevent:

I had 3 events setup:
* Race A, 5 km race - No priority  (this event)
* Race B, 10km race - Supporting (in 8 weeks)
* Race C, Half marathon - Primary event (in 14 weeks)

For some reason my watch never seems to want to have more than 2 events synced at a time, trying to sync the one not synced pushes another one out, so I had Race A and B showing up on the watch.