I got this one.

http://www.amazon.com/dp/B00OOENVYU?psc=1

Very solid front light. They changed the mounting system so it should be much better now. Very bright. The light has taken a serious beating (dropping, falling off because of old mounting system, accident, general stupidity.) and is still going strong.

The rear light is fine. I like something a little more intense than what that Shark light comes with. Planet Bike Super Flash is really nice. You can throw it on your bag too if you just want it was a backup.