Sounds like the S6 is what you want. Smoother shifting and better ride feel. If that's your first impression don't over think it. I would go for the new one. You would have a warranty, know the bikes history and get some LBS support to start out. The Madone has the 5700 105 that was OK but 6800 Ultegra is really nice gear. Seems like an easy decision.