You are correct and great analytical skills.
Update amongst current owners would be way higher if AWD came out first but it would be a 55-57K or so Model 3.
I was prepared to pay whatever it cost for AWD, after having once driven a P85D Model S, the way it handled! But I have no complaints about the way my RWD handles. If I stay in Spokane and don't move to Maui I might upgrade to AWD in a couple of years. In Maui I don't see much use for AWD.