I feel the same. Soulshard farming just feels like.... farming. The classquests for warlock are also quite annoying imo but are also rewarded properly.
On the other hand Warlock scales better. And you will always be mad when Warlocks kills your hunter in 1on1. When you are used to the WL selfheals and survival toolkit hunter feels very limited.
However I would roll a hunter if I were you because it is a fresher experience for you.