Alright, I've had my Surly LHT for a few months now, and have made quite a few changes to it since I bought it. Honey Brooks B17 Champion Special, Shimano Ultegra seatpost, Surly Nice Rear Rack, a new (as of Monday) Arkel Utility Basket, Honjo Fenders, MKS Pedals and toeclips, assorted odds and ends from Velo-Orange. I'll be adding a bell and some new bottle cages soon (so I can put the ones it's using back on the bike they belong on). But, my next two upgrades are gonna be BIG.
One will be a complete front end/brake rebuild/change consisting of...

Handlebars: Nitto B115 45cm
Headset: Chris King, silver
Front Brake: Paul Neo Retro
Rear Brake: Paul Touring
Cross Levers: Either Salsa or Paul
Cables (B&D): Gore Fully Sealed Stainless cables.

Total cost for this upgrade is gonna be around $600.

The other upgrade, will serve a completely different purpose, Wheels/Lighting system.

Front Wheel: SON28 36 hole 3x laced to Mavic A719 rims
Rear Wheel: Phil Wood FSC 40 hole 4x laced to Mavic A719 rims.
Headlight: Schmidt Edelux
Tailight: Busch & Miller Dtoplight plus xs.

This upgrade will be over a grand, especially considering I'll likely order the wheels and lights from Peter White.

Hopefully soon, I'll be getting a nice bonus from work and so I should be able to take care of a substantial sum of either (around $400, hopefully). What it doesn't take care of, I'll just save up for to finish it off.
But, if you were in my position, which option would you pick. The first one serves multiple purposes in terms of ergonomics, aesthetics and braking performance, while the second only serves two, lighting and nigh-on indestructibility. The lighting became especially important to me after my first rainy commute the other day where having had a headlight would have been nice, and since I ride this bike every day and am car free, I'd like my mode of transportation to be very reliable (yes, I know also kind of a theft magnet, but I have yet to need to lock it up outside). At some point I also intend to take this bike on some long tours, and all of this will benefit greatly then, as well.
Thanks all.
-Gene-