New generation lock barrel spinning around

Hey guys!

I just bought a Fabia mk1 from 2005. It has the usual problem with the driver's side key just spinning around in the barrel. However as I took the key barrel out I realized that it's not the notoriously bad early design, but a revised one. I found very little info on that one, except that it was used I think from 2004-2013 in Skodas and possibly other VW cars too. I already ordered a repair kit, but that is only for the earlier lock design.

Once or twice the key worked properly in the last month but almost always it would spin freely. Upon taking it out I noticed it was kinda dirty much more so than on the passanger side, which I also took out to gain some insight on a working one. Strangly it seems a little different to the one on the driver's side.

However I'm still clueless why it doesn't work or how I could take it apart. I also don't see any broken parts, brushing somewhat clean also didn't help. As you can see in the video, with a little push on the other side of the lock, it starts to rotate with the key. I attached photos of the faulty lock and a video of it as well as a video of the working one.

There was also an issue with the lock indicator pin, that was kinda in a halfway position and didn't move. But fiddling with it while also operating the central lock I managed to solve that one. I'm pretty sure its unrelated to the lock barrel though.

Does anyone have experience with this design? Can it be fixed somehow? I wouldn't want to buy and fit a pair of new locks and ignition switch if possible. Do you think something could be broken that's not visible and not replacable?

On the upside while removing the locks I learned that the car raises or lowers the electric windows if the key is held in a rotated position. Cool feature.