The lease rates are so low because they kept the residual high. So your best bet is to lease another Rivian. Most likely the residual will be far more than the car's value. The deal is the deal and they can't change the payoff at lease end. So wait 33 months and decide then.
This is assuming you would lease a quad gen 1 v a DM gen 2.
Since you're only having the car for 3 years, I'd rather have the better power and quad motor and gen 1 upgrades, than the slower and less capable gen 2. Then when the lease is up get the gen 3. I got my quad gen 1 a week before the...
Which car? S or T? I pick up Saturday too and had to sign new contracts, but the numbers looked the same and I think the only change was the actual mileage.