I think I've nearly come to a decision on lenses, thankfully because I've been thinking about it way too much.
I think I'm going to go with a used 28-105mm F3.5-4.5D, it will give me moderate wide angle coverage and decent telephoto coverage as well. I decided to go that route, because I'd rather spend my cash on a vacation where I'll get to use my gear, than let my gear spending use me.
I thought a lot of about the 16-35mm F4, and I know that I'd like the lens, but with tax it would be $1400, so that will have to wait till the end of the year or early year. I might use some of the cash I was going to spend on lenses renting the 17-35mm F2.8 for my trip, not sure yet.