Given everything you said the best upgrade for you imo would be a 32gb SSD and/or 2-4gb more ram. I would lean on getting more ram first . Later get a SSD. Only put wow folders on the ssd and nothing else. If you are comfortable with symlinking you can get a performance boost with that too.

Drommon