Time for some new batteries I think, neither of those look like anything decent. Molicel P42A for 21700 or P26A/P28A for 18650 would be my go to for a regulated mod. If it is only a single cell mod maybe try a dual cell mod instead, but make sure you get some new cells for it as using two different cells could be asking for trouble.