Are my excess 401K contribution calculations are correct?

I changed companies in 2020 from company 1 to company 2.

My 401K contributions are as follows:
From company 1: $1,459.32 (In 2020 tax year)
From company 2: $19,500.00 (In 2020 tax year)

Received a check for $2,169.23 (that includes both contribution + interest) from company 2 in February 2021 (Prior to March 1st, 2021)

 

Questions:
1) Company 2 did not send me updated W-2. Did the company 2 do the right thing by not sending out updated W-2?
2) Since my over contribution is $1,459.32. Am I correct in that this amount should be added back to 2020 taxable income?
3) The interest on over contribution is $2,169.23 - $1,459.32 = $709.91. Am I correct in that this amount should be added to 2021 taxable income?