The lights on the market today are so radically different than my previous lighting system I did not know where to start. So, thanks to you all for all the great help in this thread.
I went to my local bike shop (REI, actually) and looked around. Here's what I did.
I went inexpensive on the tail light (under $25). I bought a
PrincetonTec SWERVE LED tail light. It is awesomely powerful compared to the older lights I had, so I thought I'd start cheap and go up as I felt it was warranted (that Dinotte tail light looks pretty good to me).
I bought a
Cygolite Mitycross 320 head light. I bought this very expensive light ($200) because it has decent reviews, has a good beam pattern (see one of the links above) and it was very compact (I don't need four to eight hours of run time). I also liked the QD Handlebar mount. I can take it home, charge it up and test it out. If it sucks, or is too good, I can take it back for a full refund. If it's nice, I keep it. Either way, I'm covered.
Plus, it looks like WALL-E.