The point of upgrading via apt-get is not to lose your settings and installed applications, if you have to reflash a clean chinook, it's probably better to wait until the diablo images are out and flash those instead.
I can understand if you don't want to wait though