last summer I owned a 2005 FJR and 2004 Vstrom DL1000. When SkooterG brought the demo truck to New Hampshire (the same event FJReady was talking about) I had already reached a decision I would be replacing one of those two bikes. Going into he demo I was pretty sure that I would be buying the 2014 Tenere ES and replacing the old 'Strom and keeping the 2005 FJR for two up days.
My "mistake" that day was in riding the 2014 FJR ES first. Like FJReady said, it was smoooth as buttah, and I really liked the ES suspension. By the time I returned from that short test ride, I knew the die was irreversibly cast. I did still test ride the S10 ES, but it underwhelmed me after riding the FJR. The shop had an FJR ES in stock and put a deposit on it that day.
Part of my ability to make the choice so easily was that I also happen to love my old Vstrom. I like the L-twin Suzuki engine better that the parallel twin Yamaha. The rest of the Tenere package would have been an upgrade, but honestly it didn't feel like enough of an upgrade to make me drop the coin on it. Obviously the 2014 ES did.
I suggest riding them both for as long as you can get away with before making the final choice. Don't just compare the Tenere to your old '04 because the 3rd Gen ES is quite a bit better than the old 1st Gen ever was, even a good running one with aftermarket suspension.