I think the next thing I would do is go all the way back to stock 2.1 and take the OTA updates to ED03. Then re-root and reinstall whichever custom ROM you like. Will be a bit of a lengthy process but you'll have the most up to date radio then and a brand new fresh build.