Decided to upgrade to LEDs so as to be better seen.
Went with Sunpie headlight as it's cheap and it's worked well on my Heritage for few years now.
For the front turn signals, rear turn/brakes and rack light I went with Custom Dynamics as they review well and have a lifetime guarantee.
I also decided to add the Custom Dynamics Magic Strobe so the rear lights strobe before going solid during braking.
Not a cheap upgrade with a new cost of around $700 but I was able to score the front turn signals and Magic Strobe off ebay which saved me $80.
The install was pretty much plug and play and it took me about an hour to get everything installed.
Pleased so far.
Pictures and videos are limited on this Forum.
I've got more uploaded on hdforums.com.