The many extensions made to the 737 culminated in unacceptable stick force at high alpha. The MCAS cure proved itself worse than the disease.
So yes, begin with removing MCAS and finish with restoring aerodynamics at least as good as on the NG.
Most likely that will require a cowl location and sizing similar to the NG with an engine that fits.
The MD marketing experts at B can figure out what discount would incentivise A to take the current MAX engines off B's hands.
Perhaps a few original MAXes in drone configuration could be kept for the MBA crowd.
There was a point when B could have taken over the now A220 program for a very good price. Instead their tariff lobbying put it into A's hands.