I'd take the '17 for reasons given above (plus I never use the moonroof on my GTI but that's me), but send this guy a PM and see if you have any luck grabbing that allocation if you want to try for an '18.
http://f87.bimmerpost.com/forums/sho....php?t=1396363