Yeah, rather than fire making gear (which I do not need in my over-water survival vest) I went heavy on signaling gear:
Electronic:
PLB (ACR ResQLink),
Icom M72 VHF radio,
Garmin GPS (in order to give a lat-long to any nearby ships/boats responding on Ch.16),

Visual:
2 x signal mirrors (I'll probably not be alone),
dedicated strobe,
flashlight w/ strobe mode)
chemical lights (not real bright but totally waterproof and do not need batteries).

Other than the signaling gear, there's a Spyderco Atlantic Salt (fully serrated folding knife) and a small FAK (for use once in the raft).

BTW, no food, no water -- if I'm in the water long enough to get hungry or thirsty, I'm probably already passed out or dead from hyperthermia.