My battery died and I did an upgrade. I picked up the Daweikala 18000 mWh 3.7V 18700 Battery. It's a bit of a tight fit but lasts forever now and has the option of type C charging if you pull off the cover and plug directly into the battery.
The HG-938 doesn't have bad handles but I prefer to use the Mayflash SNES/NES PC controller adapter extra cable for the Famicom to NES then use the 8Bitdo NES Dongle and my Famicom Online Controller.