I'm in the same boat. My Model Y has to last until the R2 with lidar comes out. Hopefully it'll have some value left in it.