Electric lawn mower connectors current capacity.

[NOON Design]

I've been given an electric lawnmower that stopped working and so far I've found this melted connector that joins the battery to the motor controller internally, so no regular disconnect needed.
Everything else seems ok so far, hoping it was just a bit loose and overheated. There are so many connectors available I'm getting a bit overwhelmed and could do with some outside opinions.

 The motor controller says 800W and the battery is a 36V lithium. 800W at 36V is  about 22A, so the connector has to be more than this obviously. How much bigger is a good safety margin? Any recommendations for a readily available (Australia) connector? Even Jaycar has a few high current 60A connectors they recommend for RC.

And what is the best way of connecting the wires? Obviously have soldering gear, I only have a very basic crimping tool. Usually high current is crimped as soldered can melt with fault currents.

[Whales]

I know the XT series is popular (XT30, XT60, XT90 where the number is the amps rating) for lithium battery packs.  Presumably they're designed to handle vibrations without failing.  Solder-style (BYO heatshrink).  There are both in-line and panel-mount variants.  LCSC stocks a variety but you probably want something  more local/faster if your grass is getting thick, so the jaycar tax might be OK.

No personal experience, sorry.  If you don't get much luck here then try some UAV/FPV forums, they will have extensive experience in hooking up lipo packs to high current draws (just like your lawnmower).  Also might be worth searching those forums for  "XT30 failure" or "XT30 melt" to see if there are some common downsides.

EDIT: For solder-on connectors like this I wouldn't necessarily jump to a bigger size.  If you don't have a big enough soldering iron then the joint on the bigger connector might be worse than on a smaller connector.