For your battery... Are you out of atomizers for your Yocan? Cause they don't all leak like the one you had. I've never had that problem with any of mine.
I really prefer to just dab when at home and tend not to medicate when I'm out. But if I am going out and I need a pen I usually grab my Dr. Dabber or the Yocan Plus because those have been consistent for me. And they're small enough to carry in a glasses case. And the Yocan Plus has the little concentrate container on the end. Handy. I've just been super lucky with my batteries not crapping out on me.
I just got a Puffco Plus that I haven't had a chance to try yet. That seems to be more of a one hit thing though; rather than a load and go.