If you have a leak where the header and the top meet, then it is either the header weatherstripping or the latches. If the weatherstripping looks worn, then get some new stuff... but if the latches are weak, water will leak in when your on the highway. You can adjust the latches by tightening the j-hook to get a better seal. The wonderful convertible top design allows the frame to land on top of the windshield, so all that air on the highway pushes it up (especially when your going over 70-80mph).
As far as wind noise goes... new weatherstripping wont really help, unless you have gashes/holes in the current weatherstripping.
So in my opinion, try adjusting the latches... if you still get a lot of water, you probably need weatherstripping.
Also... there are little set screws at the first hinge of the frame... adjusting those might help, but it also might make it worse. This is probably the last thing u should mess with.
One more thing... Make sure that you aren't mistaking a leak at the header with a leak where the header meets the pillar weatherstripping. There should be a good seal at this location. Use a hose and squirt this location to see if there is a leak.