just started a warlock and i was kinda disappointed that he started with a two handed staff as a heirloom weapon , most skills of the warlock depend of total hp so it would make sense to play him with wand and shield , maybe you should consider changing warlocks starting heirloom weapon to wand.
:)