Yes, that's how see it. I think it was a bit odd to present that stuff so far out from the expected ship date and cause the confusion they did around the R2 release date and what's coming when.
It's my current understanding that it will launch with Gen2 hardware and no lidar. No word on if there's an upgrade path or not.
It will be some time before I really trust FSD or even hands free so it's probably not an issue for me... but I had to cancel and re-register on the wait list so by...