If you use the Autobackup plugin to make a backup of your settings, and enable autoinstall to make a backup of your installed plugins, the image will prompt for the restore of these settings on the first boot after a new flash.
With this you'll be up and running in no time without having lost anything (disclaimer: it does not backup/restore anything installed by hand, you have to make sure these things are selected for backup yourself).
Thnx for this tip. Flashed new image and auto restore worked. Everything is working now!