Wide angle zoom lens designs for a FF image circle are more difficult than telephoto zoom designs - the fact that the 70-200/4 and the 17-40/4 are close in price is consistent with the 17-40 needing more optical compromises and suffering lower IQ for them. It has a LOT of barrel distortion, and at wide apertures, especially at the wide end, the corners are a mushy mess. Not sure if one of the EF-S lenses you sold was the 10-22mm, but the small image circle makes a huge difference - for the same cost, the 10-22 delivers much better optical performance (rivals the 16-35 II except for the slower aperture).
Now, the 17-40mm isn't all bad - like any piece of gear, if you know its limitations and how to work around them, you can get good results. For example, don't shoot architecture at 17mm. Generally, if you shoot the 17-40mm at 20mm or narrower and stopped down to f/8-f/11 (e.g. landscapes from a tripod), it's fine. If you plan to shoot at 17mm f/4 a lot, you'll likely be disappointed. So...good as a landscape lens, not so good as a walkaround lens (for which I'd really recommend the 24-105mm, as 24mm on FF is wide enough for many needs (equivalent to 15mm on crop). But, the best time to get the 24-105 is with the 5DII as a kit, when you pay just $800 for the lens.
Have you considered renting for your Hawaii trip, perhaps the 16-35 II?