Yeah, classic rookie mistakes all around. But that does remind me that I've been running the same battery in my EDC light for quite awhile. It's an Energizer Advance Lithium and not frequently used but it's probably better to change it out early and waste a little battery than have it die when I really need it.
My hiking light back in the day was a PT Attitude with a 70 hour runtime. I changed out batteries on a annual basis, even though they were still servicable.
If your EDC light is like mine (Fenix E01), and doesn't have a dimming grace period after the regulation drops out (with Li primaries), it might be a good idea to change it out periodically. Otherwise, you might be better served by just keeping a spare battery handy.