Depends on where your dealer is. Usually about 3 days to arrive a dealers and 2 days for prep to deliver if theres no extras. So a week is usually the time frame.
If you wait, you will actually be getting the 2018 model after June 2017. At this stage no one knows what the refresh design looks like yet. So it may be good to jump the line if you really are set on the current look.
How long have you had the car for?
Mine was like this at first, before 600kms, then after it drove smoother. I think you have to break the gearbox and clutch in a little at first.
If it is still doing it I would ask the service guy to take it for a drive and see if they think it is any...
I'd wait until the 18 is revealed first. Then if you don't like how it looks then go for the 17.
Otherwise you have a few years to wait before the next generation comes out.
Did you stop and take pics? If you go on long country drives like that you can get some real good photos on some nice straight roads off into the horizon!