For 3.1 we are probably going to make some larger changes to the class. I still don't want to oversell these. A popular yet cynical phrase among players is that their class needs to be rebuilt from the ground up (though I see this with probably every class, which is slightly amusing). We are not deleting the warlock and starting over. We are not doing that with any class and probably never will. We do want to smooth out some rough edges of the class though. A few things that I have said we want to look at are:

1) Improve deep Demonology for PvP and PvE.
2) Make Affliction feel less dependent on dot timers and other external mods (nothing wrong with the mods -- we just think it's getting harder and harder to play the spec with the default UI).
3) Take a hard look at Soul Shards.
4) Take a hard look at the way pets scale. (Source)

Allow us to summon whatever we got the soulshard from to fight as our demon for 5 mins. This will give warlocks all sorts of advantages they direly need. Also sacrafice a soulshard that has been drained from the following class to get :