Personally, I use a Canon 15mm fisheye and Canon 17-40 with my 1dmark2 in a Seacam housing. 15mm will result in a wide view, with some fisheye barrel distortion and wrap-around effect, but not as much as on a full frame. Though I haven't measured it scientifically, perspective is probably about 14mm in coverage (something like 110 degrees or so...) Personally, I like the compromise. 17-40 ends up a pretty decent pelagic critter lens.
RE the Canon 20mmf2.8... I used to have one and used it sporadically on film cameras, but honestly did not like it much. Sharp enough in the center, but very poor edges/corners. If you search around, you will find similar reports from others. 20mm is a useful length on Full Frame, but less so on 1.25x crop, I think. If buying a 20mm, I would personally go with the Sigma 20mm f1.8, though be ready to test and exchange if your copy stinks. Some are good, some aren't. When good, it's better than the Canon 20mm.
If you don't want to be as wide as the 15mm on your 1dmark2, I'd second the suggestion to look at the Tokina 17mm pro for a prime, and either the 17-40mm or 16-35 as zoom. If you are using Seacam, you will need the large 9" superdome and an extension ring to best use the zooms. Quality is OK, not great. But then all zooms are a compromise, IMO. Moving to full frame 1dsmark2 you will see all of the horrible corner performance for which CAnon is famous. I have been complaining about Canon wide angle for 15 years, and it's worse on the digital cameras than ever before. New Canon fixed wides are desparately needed.
brandon cole
www.brandoncole.com