At work now, but had a second to throw an example together. I would suggest cleaning up your edges, something like the attached image. Then after you have all quads and tri's you can try softening edges.

P.S: Ignore the second picture, I just copy and pasted yours and did a paint over in paint real quick.