I had a similar problem, I finally installed the Backup addon then set it up to backup addons etc [you choose] everything to a usb drive in a folder called backup...
Then did a backup [using the ADDON] to the usb drive...
Then removed SD wrote 8.2.3 image to SD , put back into Pi and booted .... and did initial setup.......tested putty
Then Installed Backup Addon again -- and setup to use the usb drive I previously backed up to...
Rebooted Pi then did a Restore from the usb drive
Rebooted again and all was well.....
Sounds like a long process, but not really.....