My knowledge is not enough for that. Because i mentionedabove the sda3 problem, sooner or later you must do a new installation anyway. Maybe you do a backup, install new and restore the backup. Thats the way i would do it because at the moment i dont know it better.