How many catalogs do you have installed in the list right now after the diablo flash?

you should be able to add "chinook diablo" to the line distribution in all your catalog repositories to recover most if not all the applications that you lost. This should allow a mass re-installation of all your applications. Once you've done that, I'd remove chinook and just leave diablo in the line distribution; that way programs like Canola 2 maemo 2 and its addon's will also be updated. I learned all this the hard way.

I'd probably also read the diablo installation threads on the forum as well. It'll provide you with a wealth of knowledge.