Wait for the facelift model in the fall and hope they pull their heads out of their asses and offer the lighting package again.
GF just got her new factory-ordered 2017 Mazda3 hatch. It has new-for-'17 adaptive LED headlights, and I gotta tell you, they are absolutely incredible. Totally make the xenon output on my Golf R look like junk in comparison. Incredible brightness, perfect light distribution, razor-sharp cutoffs, and adaptive swiveling. So impressive. The Golf/GTI family will go from xenon to LED with the facelift.