Don't splurge money on a new one until you're sure the old one is dead. Actually, who am I kidding, you'll make another one after this because we all do!
For the batteries: Beware of false advertising as it happens a lot. About the max mAh you can get in an 18650 is 3500, and GMan has a good...