Thanks for all the feedback everyone. Work has gotten a busier, so I've had to put in longer days Monday and Tuesday leaving me with less time to evaluate. I did start moving off of test charts and reviews to looking at photos on flickr for each lens. This has lead to one observation that when I think "ultra-wide" the shots I am trying to emulate seem to be in the 14-16 mm range. So I am now looking at 14 mm a little more. This brings in the Samyang/Rokinon 14 mm f/2.8 in addition to the Canon 14 mm f/2.8 II (tough to agrue with magic ). I am also looking at the Sigma 35 f/1.4, as Pat suggested. I, like I am sure everyone else, has been tempted by this lens in the past. More for low light indoor photography/and DoF, but I do sometimes use this focal length for landscape/waterfalls. It may also be a better low-light indoor pair to the 70-200 f/2.8 than the 50 f/1.4 I currently use. It also had less coma than the 24/25 mm lenses. The Sigma/Samyang combo would also allow me to save some money away for a later purchase.

Anyway, I didn't want to go too long without thank you all for your input. I am trying to have this resolved in a week or so. Thanks again.