I was using a D3 with a Nikon 14-24 f2.8 lens. I combined three RAW images 2 stop separation in Photomatix. I've experienced this before, this was a nice clear example of the problem. Not going to f22 makes a lot of sense.
I've had this problem before, the last photo was harder to correct because the aberration was around a line of trees in the distance and was very time consuming to correct in Photoshop. I think with something closer to f11 I'll be able to minimize this effect.