I like my gear quite a bit, but my DPS still seems very low.

Is the easiest path to getting at least a 25k bump getting weapons with CD in addition to the socket?

What can I expect if I go from 90% CD emeralds to 100% CD emeralds in each.

Any help would be appreciated!