if you think the mk7 headlights are bad, try driving an mk4...
i honestly don't find the stock headlights too bad, i did upgrade to a better H7 bulb than the factory one and it made it a bit better. have you checked your headlight alignment? i know mine was angled way too low from the dealer.