Sorry for double posting.
Froyo is available now via Kies but take care. After downloading and installing my phone froze and wouldn't start up. I have had to do a factory reset (UP+HOME+POWER) and am now going through the painful process of restoring everything.

You should always do a factory reset anyway. people just need to make sure they have important stuff backed up.

Yes all backed up and all restored. Thanks to Titanium (though rooting 2.2 took some effort).