But your road shots shows otherwise! Anyway...
Duncan, since you're going to throw N1 headlights in, look at some higher wattage lights? Or, the Narva 'blue plus' or whatever they're called these days work well (I bought a couple of pairs for family members' cars, they impressed me). Anything else are shit, including Philips 'style' ones.
Just be careful of ebay stuff, lots of fake Philips on there.
I got mine T10 and 30mm festoon from here (when they ran sales): http://www.powerbulbs.com/au/store/category/led-car-bulbs/all
4,000K Philips FTW.