"Strictly for rippin" classic.

Yeh salty, no matter what gear you ride we all find ourselves in that dreaded situaion of dropping your kite right in front of a liquid freight train sooner or later.
As you progress you get better with kite control and reacting quicker to stacks (so that you're kite doesn't end up in the drink). Then you get a bit better - push the envelope more with riding on the edge of control - and start stacking your kite into waves again.

In the event of having the kite 'catch' a wave on my 5th line Cs I used to bail to the 5th straight away so that the kite had minimum resistance (and shape) to take the force of the wave.
On my bows it doesn't make much diff as the bridle holds the kite in shape (perfect to grab a whole wave and shred to pieces) but I try to swim with the kite if it gets dragged to minimise the oomf. If the drab is big-time (and so is the wave) I have bailed out completey - releasing the kite. I ride small-ish beachies mostly so I can make it to shore pretty quick and get to the kite. However, if you are in big stuff way out it might not work for you?
You are correct to bail if you feel you will get rolled in your lines etc though.