Ya I'd agree that it's not worth dumping $$$ into a weak tranny.
I have an almost spent BA10 in my MJ, it is being swapped with a AW4 auto, once I gather the little parts and a 21 spl T case I need for it. I could send the Peugot up to ya (free + shipping from 28327) if you need anohter parts pile
The only bummer of an AX15(or newer AW4) swap is that the peugots and early AW4s were 21 spline output. AFAIK the AX15 and newer NV3550 are all 23 spline. The slick deal would be to pull the tranny and matching tcase out of a wrecked XJ/MJ/YJ/TJ then sell your 21 spline case for a bit of $$$ to offset.