have you tried the 6th Sense?
it will upgrade your system and leave your stuff alone. It's experimental tho and it does work. I have used it myself, just had opengl issues afterwards, but fixable. Downside is that it takes several hours to do. Good to start and than go to bed, should be done by morning.