the math seems sound.
I also agree with the decision to keep optionality. While used R1S has had crazy high resale value the last couple of years, I see that going down in the future because: 1)R1S supply will be going up as 2023 leases roll off, and 2) R2 will become available next year...