CFMoto 650TK lights upgrade - better bulbs, HID or LED?

The 650TK has pretty poor headlight performance. This maybe due to the H8 bulb that is normally used for fog lights application. I am currently weighing up which upgrade is the best with reasonable value.

Option 1: To replace with a better bulb. Found this online:
http://www.gumtree.com.au/s-ad/black...ion/1077544995

Option 2: To install HID conversion kit. Is there one that allows the use of H8 mounts? Or we can pretty much use any with the HID conversion?

Option 3: To install LED bulbs. Preferably one with a fan built at the rear. Wonder if H8 version exist.

Winter is coming and planning to do more riding daily. So good lights are essential.

Thanks