It's all about unique content. Links aren't content and affiliate links are negative content. Right now the whole purpose of your site is to get the user to leave. A rule of thumb might be that if you have to ask if too much of your content is affiliate links, then it probably is.
If you're getting anywhere with your site in terms of making money, then I'd keep it as is and forget about ODP. If you really want to create an informational site, then go for it, but as the webmaster of an informational site I can tell you that that's not where the money is, ODP listing or not.
If you significantly change your site, by all means submit it again. Best of luck.