Thanks everyone.

I'm leaning toward Edelux in front and the B&M rear that does the brake light thing.

This is going to be such an improvement over what I have now.