If it's just the latch part of the assembly that is garbage then there are better options available to replace it with. The VW piece can be quite flimsy, I have on also, but VW made better quality ones, and I believe Porsche made even better ones again that should fit.
they're just a little hard to find on eBay
As an example, here's an ad for a 944 latch, obviously its old and poor condition but you can see the quality is far better than the cheaper made VW parts.
https://www.ebay.com/itm/Porsche-944...0AAOSw2s1Uyy4r