Against any Hunter, it's a hard fight. That's made worse by the fact that almost every levelling Hunter over 40 has a pet Fear-break for more than enough time to kick your ***, an on-demand 3-second stun from his pet, and after 50 he'll also have that Fear Immune for himself.
You're right about the strategy though. When he's not Feared, keep in his face: he can't shoot his ranged weapon from melee range. Since the deadzone was eliminated, though, this is difficult, as he can now fire off a slow from a millimetre outside melee range now.
Pet-wise, put Siphon Life (if available), Corruption (if you have Nightfall) and Curse of Weakness on it.
A Hunter is always a hard fight for a Warlock. If he's Beast Mastery he's almost got a free win. A Marksmanship has an extra on-demand interrupt at a range, and a Survival Hunter has Readiness, which isn't really much to worry about.