you need the trunk hinges absolutely and then possibly a latch or maybe you need to adjust the catch..
I have had this issue with other cars I have owned. The position of the latch mechanism is indeed generally adjustable. It is also possible that part of your latch has simply worn out, but try the adjustment first.OK good so you can adjust the latch so that it catches sooner...
Do you adjust it on the trunk lid itself, or the bumper/trunk part?
04's had the badge hinges in some of them too. my wife's jetta and my passat had them.03 had a hinge TSB because they would get hard to close. It might pertain to 04. Make sure to get them to paint them prior to install.