Retirement tax questions

So to summarize, if the excess deferral is issued to me after the deadline of April 15, 2023 but before April 15th, 2024:

 

1) For my 2022 filing, I add the excess deferral amount as Miscellaneous Income following the instructions that DanaB27 gave, but I DO NOT adjust the amount in box 12 code D as I did not make the corrective distribution before the deadline.

2) The excess deferral and earnings made on it will be reported once more in my 2023 filing as a 1099-R form as codes P and 8 respectively, and at that time I may also pay an additional 10% tax penalty for the early withdrawal.

 

Sorry for all of the questions, this is my first time encountering this situation and I just want to make sure I have all of the details straight. Thank you very much for your help!