Do you need the upgrade right away? If not and you have a decent budget I'd reccomend waiting to the end of the year to grab a Framework 16, with the Framework you'd be able to upgrade the gpu in a couple years while keeping the rest of the hardware.
They've got a good track record so far with their 13inch.