Maybe, or maybe you just really have not found that bike you just gotta have yet.

I'd go for the 11 speed rear over the 10 speed.
If all other things are equal, I'd go for the lighter bike.
The soon to be 4 year old bike is still too much money even with warranty. The likely hood you'll have anything occur that is covered by the warranty is pretty nil, IMO.

Don't let "bike fever" cause you to buy too soon. I might be worth waiting for the 2018 to hit the floors at the LBS's.

If 1500 to 2000 bucks is not a stretch on your budget, then don't cheap out on a bike with components that are considered lower end. Components make the bike.