I am amazed no one has yet mentioned Dinotte lighting for any bike lighting needs. I've been very happily running their 200 lumen headlight for almost a year--I use it 3 days a week from Sep to April, twice each day, and it works very well. I literally just finished mounting a new Dinotte taillight on my Trek Pilot 5.2, and that's a huge improvement over any taillight I have ever seen. Check out:
http://www.dinottelighting.com/index.html
There just aren't better lights anywhere near the $$$'s spent, from what I've seen.