401K Excess Contribution - Box7 (Code 8)

I have exceeded my 2021 401k contribution between 2 employers. I did excess withdrawal from my current employer (Vangaurd providing 401K service). I have not received any 1099-R form; Vangaurd informed me that they will send 1099-R only in 2022. How to report this in 2021 filing.

 

Received the refund check with this breakup:
Excess Pre-Tax Deferral = $659.73
Allocable Income = $27.61
Total Amount of Refund = $687.34

 

I am entering this refund as if I received the 1099-R form with these entries. 

Box 1 and 2a = $687.34
Box 7 = 8 - Return of contribution taxable in 2021



Am I doing this correct? Do I have to enter full refund amount or only excess pre-tax deferral in 1 and 2a box?

Thanks!