Don't know if this will help.

I have a 2001 Wave that has had leak problems. First I glued the pads down with 3M Trim and Gasket adhesive(nasty yellow stuff in a tube that Auto mechanics call Gorilla Snot). That seemed to solve that leak but periodically it would take on gallons of water . I pressured tested it and there were no big leaks. Finally I replaced the port hatches and found there was no sealant, just a rubber gasket. I sealed the new ones with 3M 5200 and no leaks now. I am guessing that sometimes the hulls flexed and opened a gap between the port frame and the hull.

Another Tip -On the Tornado and A Class many people have been just gluing the port frames down. No screws at all on the theory that a screw is just another leak path. On the Wave I put 2 screws in because I was not sure how well 5200 would adhere to the Wave. So far it is holding.