17-35L is not quite as good optically as the 16-35L but I don't think you'd notice much difference underwater. I bought the 17-40L which is a great lens (f/4 is fine for underwater IMHO)
Macro: I've only used the Tamron 90mm macro. The 100mm EF is optically similar with better autofocus. That's what I'd buy.
15mm Fish seems to be a good choice (Sigma if you're feeling cheap) for wide angle. I've seen nice pictures from it, but haven't shot with it myself yet. I don't think the 14mm is worth the price, personally.
28-105 - I actually do own this lens, never really liked it, haven't been tempted to take it underwater. I still carry it around in my bag, but it never gets used. More recent versions (Mark 3, I think) are cheap and nasty. Its OK I guess if you feel the need for a midrange zoom.
I have considered the Tokina 17mm, but there doesn't seem to be much point as optically I don't think it's better than the 17-40L. There's no other tempting wide angle prime choices that spring to mind. I'm sticking to the zoom.
24mm f/2.8 - I used to like this lens, but there's no real advantage over the 17-40L so I haven't bothered submerging it yet. Maybe on a 1Ds. Not really wide enough for the 10D.
1200mm - When Ikelite make a port, I'll buy one.