how about the EF 100mm f/2.8 macro lens?
Can't really recommend this macro lens. It has ugly bokeh rendering...I own it, got it cheap used...I also own the Tamron 90mm AF-SP, which is MUCH "prettier" in the way it renders OOF highlights, which can and often are, a fairly big part of macro photos. The Canon 100mm EF, the "regular" one, not the new L, and not the "old" long-extending one, but
the standard, internal focusing EF f/2.8 model that's been made for well over a decade is at best, an average imager in terms of how "pretty" it renders its images.
Sigma's 105/2.8 EX-HSM is prettier; Tamron's 90mm AF-SP is a very pretty imager. Sigma's 150mm f/2.8 EX, the pre-OS model, is one of the most GORGEOUS imagers of any macro lens I've ever seen in my life...the Canon 100 EF is just "Mehhhhh." Ugly, 7-sided bokeh balls. Slowish focusing. Basically, lifeless image rendering. Just NOT a "pretty" lens drawing style; get the Tamron 90mm AF, used, from one of a zillion outlets if you want a NICE macro lens that make pictures that "look beautiful". Even Tokina's bargain 100mm f/2.8 AT-X has a prettier image rendering characteristic. In macro shooting, the "way a lens draws its images" is often a VERY big,big part of the final image's overall impact. The lens puts an impression on the pictures it makes, and this is probably most critical in macro, and in portrait shooting.
The whole body OR lens situation is difficult. I think the newer APS-C bodies have a lot going for them as long as the ISO levels are at 320 and lower, the image quality is very high, and the cost/performance ratio is VERY high on something like the 60D, since the 70D has caused its price to drop a bit. The Canon 10-22 EF-S probably has one thing over the Sigma that is a BIG deal: flare resistance....it's one of **the** biggest deals for landscapers when they pick out a wide-angle zoom...having the ability to put the sun right in the frame and not have the image flare and ghost is one of the 10-20 EF-S's strongest suits.