Salt Water - It's What's For Breakfast!

I saw reference to this in another thread but I cannot find it now ...

I have never had any stomach issues on the bike, but I did a little bit at the Gulf Coast Tri in May.  I haven't had any issues since then, so I am confident that it was not my nutrition because I finished the Infinit container without any subsequent concerns.  So, I *think* I have self-diagnosed the problem as taking into too much salt water on the swim.

I would like to believe that IMFL will have calmer and flatter seas, but with the mass beach start (read: thrashing bodies) and the doubled distance, I need to expect (unfortunately) to take in some salt water.  Since I can't really practice that in training, what advice do you have on the nutrition front to avoid stomach issues on the bike? 

Should I just start with water and hold off 30 minutes (instead of my normal 15) before starting my Infinit?