My advice is never to compromise on a car order - have been there - got the t-shirt ! and regretted it !

Probably best to try option 2 but perhaps take the line with the dealer that you are happy to wait but if they want to make you a better offer on the park assist & sunroof you may consider it. Can't think the dealer is inundated with cutomers wanting to buy new cars if the UK is anything to go by.

But get yourself in the mind set to wait - I had to wait 8 months for my order last year !