You don't want to try the A6 or Saab 9-5?
The saab 9-5 is a pretty direct competitor to the S80, just as comfortable- but more sporty. You have the option of a 3.0 V6 TDi if you want a diesel. Costs a little more than the S 80, though, but I don't think you will regret test driving it!