Are you assuming the 4680s will still come from Kato Rd? The cell manufacturing line in Berlin looks like it still has a few months to go before production can start - and presumably there will be a testing phase on top.
I assume the Giga Berlin production will start with 2170 cells and 4680 will come from the battery plat in Berlin at a later point in time.