I'd go with the 85 no doubt. You're obviously buying this as a car for nice days that will only see occasional use, why inherit someone elses problems?
Not sure if you want air cooled for sure or not, but earlier 996's are around the same price point from what I have seen (although I am not a porsche expert).
