Agree. Also, we only know the products that will be revealed this year and likely put into production by 2021.
Tesla will likely have six new products in six years (2016-2021) -- Model X, Model 3, Model Y, Pickup, Roadster and Semi. Does anybody really think there won't be new products rolling out from 2022-2025?
Of course there will be -- possibilities include smaller cars, different flavors of SUVs, maybe smaller and larger pickups (from Ford Ranger through Ford F650), van(s), smaller trucks, other commercial vehicles, etc.
Elon is talking about multiple TWh/year. He's not going to stop once the Model Y, Semi, pickup and Roadster are in production. The line-up in 2025 will almost certainly be larger than what has been announced so far. Zach's number is way too low.