Curb weight

I’d think upgrading the hitch receiver would certainly be less than buying a new toad.

5k tow rating should be no problem with a sprinter chassis

See if the dealer/seller of the 2016 rig will include in the deal, changing the 4200/350 pound hitch to a 5000/500 pound rated one. Many 2016 MB chassis rigs have a 5000 pound hitch. They should be available. Tell the dealer what you learned about the towing problem with your Cherokee. If he includes the 5k hitch in the deal, then you are good to go ahead with the deal again. The cost of a new 5000 pound hitch to a dealer will be around $100, and his own labor cost even less so I think he would agree to that.

If your GCWR is overweight thereafter, then adjust your load accordingly by carrying less on-board water and such.

At 24 ft I would try it without the toad first to see if you are OK with it. I am used to a toad and it is convenient, especially with a Class A or larger C, but several on here just park their short C anywhere that you would park a big truck or SUV.

“do the towing math before you decide what path to follow.”

x2

It's a Cherokee. It's a Chrysler SUV with a Jeep badge.
Get rid of it, and get a Wrangler, if you want to tow a Jeep.
However, it sounds like you're GVWR/GCWR challenged, so do the towing math before you decide what path to follow.

If you love having a toad weighing more than your new MH will handle, why would you buy that MH? This “getting older” stuff is mental, not physical. So it takes longer to hook up? So it takes more concentration? So what?

The Jeep is toooo heavy...trimming won’t help.