If 35mm is adequate, there is the just announced EF-S 35mm Macro w/ integrated ring light. Check the 3rd image on the B&H product page to see the ring light. I won't link to B&H here as I won't have the Bryan's referral code in the URL, but just search for "Canon 2220C002"