Mana Leech could help recover mana when you do need to switch to a melee weapon, and there is also a Mana Efficiency skill. A bow could also be helpful waiting for cooldown times or mana recovery.
I had no problem in D2:ED maxing Lockpick early, but played a warrior, so didn't need to invest in a lot of skills early on.
