Another option to consider might be the Tokina 100mm 2.8 Macro. Ours is the Canon-fit version; it is a very good lens. I bought my Canon 2.8L Macro because I wanted a weather/dust-resistant 100mm with Image Stabilization, to use at work, not because the Tokina was lacking as a macro lens. For macro and short telephoto, shot on my own time, I still like the Tokina, and may well purchase the Nikon-fit version.
This is not an indication of prejudice against Tamron! My wife uses an 18-200mm Tamron regularly on her D7000, and we have a Canon-fit version as well, for the times she shoots one of the Canon cameras.
Canon 7D/5D/40D/1D2N; Nikon F6, FM3A, & Coolpix A; Canon 40mm Pancake, 135L, 50L, 35L, pre-II 50mm 1.8, 100mm 2.8L Macro, 10-22mm EF-S, 28-135 EF, 400mm 5.6L; Nikkor 50mm 1.2 AI-S, 50mm 1.4G, 50mm 1.8D, 16mm 2.8D Fisheye, 180mm 2.8D, 100-300mm 5.6 AI-S; Tokina 17mm & 100mm 2.8 Macro