I have decided its time to replace my aging 1998 Volvo S90 (460,000 Km)

So I am looking at buying a used Volvo S60. I have looked at and am interested in a
--2005 S60 (body/interior is in really good shape, 159000km, drives great, a little more undercarriage rust)
---(new radiator, breaks) and a

--2007 S60 (body is in less good shape for sure, a lot of little paint scratches and stuff, missing the drip molding on both sides and a cracked plastic body piece like the side runner piece,much less undercarriage rust, interior is mint, 179000km)
---(new.. breaks, front shocks, timing belt)

I would prefer the 2007 (two years newer, assumed higher quality car) but it seems like it has been roughly used. They both drive great but I read in the upper post that the 2005's and back are much more troublesome, which is leaning me towards the 2007 but the 2005 is in better shape so I am torn.

Any feedback/opinions on those two model years would be greatly appreciated. They are priced at $6000 cdn and $6500 cdn respectively. Are these good buys?

Thoughts and opinions from all will be greatly appreciated.