not sure if all this applies to the 2nd & 3rd gens, but it helped tons on my 1st gen trunk..
here's the most important part, before:
and after being wrapped with electrical tape (trim peices out in this pic):
then go inside the trunk lid and pull this clip out:
pull the lock out:
then wrap tightly with tape:

*it might be hard to get back in, but it'll go. also, if you use your key to open the trunk (I never do), make sure it all still moves freely..
not sure if it helped, but I put polyfill between the whole latch and the trunk lid:
and if all that fails, loosen these bolts, and move the hook down a little:
that's about it.
