If you can afford the Canon 100mm Macro f/2.8, get it and don't look back.

The Tamron 90mm Macro f/2.8 is an excellent lens and the same that I use on my Nikon. If you can't get the Canon macro, then get this lens.

You are looking in the right direction....don't get anything less than a 90mm macro and f/2.8 lens.