Close-up zoom?

I'm after a zoom that has a good close-up ability.

I basically want something on my D7000 that replaces my Olympus 14-54 which I sometimes use with the 1.4x TC attached which gives an EFL of 39-151mm with a minimum working distance of 5cm.

I was looking at the Sigma 17-70 but I would maybe like something with a bit more on the long end as this would only give me an EFL of 26-105mm with a similar working distance I guess on a D7000 (minimum focus distance is 22cm on both lenses the I thing the sensor is slightly closer to the lens on my Olympus 620).

I don't want to add a CUL as I don't want to take all close up shots with it.

Any other lenses I should look at?