Keep us in mind when you get the repairs completed. I would like to know how everything went and how long it took. Mine is coming up on 3 years but every thing is still good. If I was on your situation I would get the battery replaced as well even if it's still ok for you. They have it opened and this would be the prime time to get it done.