Someone already mentioned this... a quick, cheap thing you could try out first would be to get some nice cartomizers. I can't stand the stock atomizers and cartridges. There's too much messing around with topping off with liquid, getting dry hits when you're not on top of it, etc.. I got some of the mega dual coil cartos recently, and they're MUCH better IMO. They give better hits, are much more consistent, and they hold a lot of juice (less refilling).
I know that doesn't help with the button issue. I guess an echo might be nice for that. The small battery just seems like it's going to set you back in the quality of your vaping experience. In my experience, it's the low resistance and dual coil stuff that gives the best hits, and those will just eat up the little batteries (or even ruin them?).