I don't see that battery as an improvement over the one you have. I would try it with a new 22/25 A controller and see how it goes. If you find the bike cuts out at high power levels, then you will know where the problem lies and reassess. If you fancy the chalenge, then you could fit a new BMS to your pack, but realistically you want a pack with quality branded 10 amp rated cells with a 30 amp BMS to run the power you require. Sadly not easy to find under £300.What about the battery I found. Only 10Ah but I don't think I need more and I like that you save £15 if you don't want another identical charger to the one I have already. https://www.ebay.co.uk/itm/36V-10Ah-500W-Downtube-Lithium-Li-ion-Battery-Pack-E-Bike-Electric-Bicycle-Motor/383150878214?hash=item5935926e06:m:mGZvyZKZh0YO0ox9dfyZReg
10S Li-ion Lithium Cell 36V 40A 18650 Battery Protection BMS PCB Board Balance | eBay
Short circuit protection current : 40A ± 3A. The maximum instantaneous current : 40A. Type of batteries : lithium cobalt / manganese lithium / ternary materials. 1 x balancing Lithium L-ion Protection PCB.
www.ebay.co.uk