Hi Eyes!
If they replaced the door handles with the current version, the longevity should be fine, AFAWK, at this time, which may be of help to you...
Not sure about drive institution. My 85S just had a drive unit replacement and I couldn't get a clear answer on whether the "appropriate unit...