So are the golden chromas and borders coming back or do we really need to grind 4k tokens?

The total amount of tokens needed for all the chromas and borders is 4500 (4150 since you can buy the khazix one), plus the kaisa skin that is coming out is another 2500, so we need 7k tokens if you want everything