tescroft
In Musk, we trust.
If I had an S without AP or with AP1, I would do the same and exchange it for an AP2 model 3 with PUP.
Things I would probably miss a bit would be the power liftgate and the opening sunroof. I think it is a failure of Tesla not to provide these things as an option for model 3. Other premium brands offer such options. May be the bigger trunk and the smaller trunk opening could be a drawback in comparison to an S, depending on the usage of the car. Apart from this, model 3 seems superior to me than model S in a lot of areas. My expectation is that once model 3 is widely available, model s resale value will dive and probably you will not get the 40k you're expecting in your calculation.
Things I would probably miss a bit would be the power liftgate and the opening sunroof. I think it is a failure of Tesla not to provide these things as an option for model 3. Other premium brands offer such options. May be the bigger trunk and the smaller trunk opening could be a drawback in comparison to an S, depending on the usage of the car. Apart from this, model 3 seems superior to me than model S in a lot of areas. My expectation is that once model 3 is widely available, model s resale value will dive and probably you will not get the 40k you're expecting in your calculation.