I would scrap the wax/cotton tinder in faviour of a esbit cubes or wetfire and add a few lifeboat matches. No less than five and no more than 10. Plus a scout sized fire steel that I have varnished to protect from salt water.

Reason:
I know from personal experience that cotton/wax tinder is not as easy to light as Tinder-Quik. However it does deliver more BTU's. But, and its a big but, neither of them burns long enough to dry out and ignite damp kindling. As for trying to light a fire in any sort of breeze with a match or a lighter when your wet/shivering, well, good luck....

On the other hand,a crushed esbit block that has a lifeboat match dropped onto it, or a spark struck into it will ignite instantly.

One other point: If you can obtain one a Krill Stick would be preferable. rather than a lightstick.