I feel you buddy, its the same thing here in America, not many hobbyists left.

You should replace them with genuine 18650's, like these: https://www.amazon.com/IMREN-3000-Rechargeable-Li-ion-Battery/dp/B09ZQSSQV1/ref=sr_1_5?keywords=18650+3000mah&qid=1674165065&sprefix=18650+300%2Caps%2C138&sr=8-5#customerReviews

These ones can handle a max discharge of 30A momentarily, perfect for your application.

TP4056: https://www.amazon.com/Songhe-Charger-Module-Protection-Li-ion%EF%BC%8810pcs%EF%BC%89/dp/B082XJXQS6/ref=sxin_16_ac_d_bv?ac_md=2-1-VW5kZXIgJDk%3D-ac_d_bv_bv_bv&content-id=amzn1.sym.8f2bf95d-b9c2-4e6d-96a9-5fdf77a1951d%3Aamzn1.sym.8f2bf95d-b9c2-4e6d-96a9-5fdf77a1951d&crid=302XR3BMROQTJ&cv_ct_cx=TP4056&keywords=TP4056&pd_rd_i=B082XJXQS6&pd_rd_r=83055945-eb38-4432-a97b-20957eb4341b&pd_rd_w=4OlSK&pd_rd_wg=bisA3&pf_rd_p=8f2bf95d-b9c2-4e6d-96a9-5fdf77a1951d&pf_rd_r=9DR584RJJQHCFZNAV8BM&qid=1674165184&sprefix=tp4056%2Caps%2C254&sr=1-2-270ce31b-afa8-499f-878b-3bb461a9a5a6

Standard decent quality TC4056A's.

Identical to TP4056 (almost).

However, since you have a soldering iron, you should replace R3 (Resistor #3) on the TP4056 board with a higher value resistor to lower the charging current; the TP4056 default charges at 1A, which overheats the module and eventually kills it.

So swap it out for a 3k or 2k SMD resistor to lower the charging current to .4/.5.

And make sure all you connections actually solder into the pads.