I really think if you get one of these…
you can do away with half your problems and get a few bonus as well
dont forget the case too… very handy
but the battery polarity is reverse from standard so you need to make up your own cable or switch the pins… i get a
https://www.amazon.com/dp/B08T9FB56F
https://www.amazon.com/dp/B01M5AHF0Z