Best HID Xenon bulbs for MK2 facelift?

Hi all

I just bought a 2013 Superb Estate SE Facelift with Xenon (Bi-Xenon?) Headlights. 

On the drive home I didn't think much of the dipped beam, not very bright.

So I'm wondering if the Xenons are on the way out or are the basic ones just ****?

Either way, I'll be needing new ones. 

D2S I believe?

What do people think are the best (legal) bulbs for maximum visibility?

I'll also be doing the fogs lights too so also taking suggestions for those.

Thanks