I'd consider the Sigma 28 1.8 to complete the
blank
pancake
100 Macro
It is hellofva lot sharper center and corner wise than the Canon counterpart and built a lot better as well but the back/front focusing hassles and sending it back funtimes are not something I look forward to. If I knew I would get a good copy then it would be a no brainer.