I'm in the same boat. I stopped in on a whim this weekend to see if they had the 2017's and the 2016 deals were really good. The extra range would be nice but for extra 8-10K off the top it might be worth going with the car they have now. I don't think it will go much lower (personal opinion)...