In my turbotax desktop addition Turbotax suggest to follow
1. Report the excess deferral on your 2021 return in the Income section for Retirement Plans and Social Security whether or not you
received a Form 1099-R before you file your return. Enter as much information as you can. Report the excess deferral amount in boxes 1
and 2a, and use code P in box 7. Indicate that this is a 2022 Form 1099-R.
Which different than you suggest ? i also have question do i need to fill Payer information as well
