The new click R is supposedly easier to clip out of and the Shimano T420 has one flat side for shoes and one side for clipping in. It also has reflectors.
http://www.xxcycle.com/shimano-click...-black,,en.php
EDIT: These have rounded out plastic on the outside edge for those who can bang their shins. (It's rare but I've done it too.)
Also, I've ordered Bush & Muller lights from xxcycle before and they delivered in case if you're wondering if they're legit or not. The delivery time from France was pretty reasonable to Canada.