It's ok, we've all vaped our brains out when we first started. I still do it sometimes when I'm really stressed.
If you can afford to get new batteries, you might want to invest in a 1000+ mah or two. They hold charges for a good, long time even when vaping with LR cartos/attys. liberty-flights has good prices, and if you click the 20% off area displayed on the upper left hand side of their home page, the prices get even better.
Good luck, and congratulations on ditching the analogs!