Good idea to buy a quality new light rather than putting work into your old one.

Check out the flashlight search function on Parametrek’s website.

You can specify price, battery type, lumens, beam type, number of modes, etc. and it will produce a list of suggestions.

After getting some suggestions, look for reviews on BLF and YouTube, and come back to ask questions to learn more about specific lights.