trying to come up with a witty response in a state of inebriation is harder than it seems, all ive been able to come up with is humerously mixing the word warlock with warrior, but you just end up with warrior, which kinda defeats the point :/
Anywho, both classes seem fun to me, take a look at their playstyles and what your have atm and decide from that. From what ive read lock sounds good for you, partly because if your pally and rogues dont already have SFs you will have another char to choose between if you get a SF.