Welcome to the forum!
Regarding the lights I was in the same predicament as you as I have only had my Z for a couple of months too.
I changed the bulbs, and adjusted the light levels using the manual adjustment under the bonnet. This however still was just not good enough and I didn't feel safe driving thought the country lanes at night. So I opted for some 6000k Canbus error free HID's with slim ballasts. All ancillaries for the kit can be kept in the lighting unit and has completely transformed the lighting. 100x better!
Do it!

Regarding the lights I was in the same predicament as you as I have only had my Z for a couple of months too.
I changed the bulbs, and adjusted the light levels using the manual adjustment under the bonnet. This however still was just not good enough and I didn't feel safe driving thought the country lanes at night. So I opted for some 6000k Canbus error free HID's with slim ballasts. All ancillaries for the kit can be kept in the lighting unit and has completely transformed the lighting. 100x better!
Do it!