warlock seems to be pretty good for 5.4, lots of hunters i know are QQing and/or rerolling.
My weekly podcast can be downloaded here this week we talk about the missing Malaysian Airlines flight MH370. Where could it be? What happened to it? Are we getting the full story? also reptilian aliens.
Just the utility that a lock brings with gateways (evetho they are getting nerfed to once a minute) and health stones is pretty awesome. Being able to replace almost any buff with a hunter is awesome too but in 25 man's that isn't really needed since there should be no missing buffs at all.
Even assuming the hunter buffs to signature shots in light of Readiness's removal will bring them in line with the other dps this tier, Warlock provides much greater utility. If you enjoy both classes equally, and are equally skilled at both, I would go with the warlock.
Otherwise, for anything other than bleeding edge progression or a very hardcore-minded guild pushing H content within the first few weeks of release, just go with whatever you enjoy most or are best at.