You have a few choices. Most people are probably running Community ROM, but there's also Evil Fascination, and Nameless. Or if you are more daring there are three not completely working gingerbread ROMs based on the Cyanogen Mod platform plus MIUI and Vanilla AOSP. Just depends on what you are looking for.
Yeah, if you don't want to deal with a ton of weird issues, I would recommend ComRom 1.3. On page 164 of the thread is a detailed procedure for flashing it that seems to cut off most issues at the pass.
OTA - Same way as ED01. It's not better than ED01, just removed geotagging in the camera apk and supposed to be a fix for those who were not able to get ED01 through OTA. It's not worth flashing back to stock Eclair to get ED03.