I got a Viewpoint Flashpoint (
http://www.performancebike.com/shop/....cfm?SKU=19647) for a taillight. It is cheap and extremely bright. The Cateye TLD1000 may be another option.
For a visibility headlight, I bought the Flare (
http://www.performancebike.com/shop/....cfm?SKU=20472). The batteries that came with it were pretty abysmal, but once I swapped them for Lithium AAAs, it is extremely bright. The flash mode is a bit slow, however.