I have 2015 Axis 24.1 and the same headlight problem. I have decided to go LED all around. Replacing marker and signal bulbs with LED's was an easy process and worked well. The lights are much brighter, cooler and more visible. I was not sure what I should do with the headlight. I could not find any info on the type of bulb I would need. Some suggested H9, some H13 models. Only after removing the fog and the headlight (this was not easy) I have finally learned what I had. The fog bulb was H11 and the low/beam headlight bulb is HB5 9007. I have ordered both from Amazon and hopefully they will arrive tomorrow. I decided to go with Hikari since they supposed to be very bright (but not too much) are adjustable and the same size as my old bulbs. Hopefully this will work. I will keep you posted.
https://www.amazon.com/HIKARI-Headli...hb5+9007&psc=1
As for the fog lights I decided to go with XSPEED LED H11 yellow/amber
https://www.amazon.com/gp/product/B0...?ie=UTF8&psc=1
but also have ordered a white light H11 LED bulbs from Sealight to compare them with the yellow one:
https://www.amazon.com/gp/product/B0...?ie=UTF8&psc=1