Retirement tax questions

Thank you, NC Person,for all that helpful information! I appreciate it very much. The only question I need answered at this point is confirmation as to how we rectify the situation with the IRS. I think I understand it to be that my wife should take the missed 2021 distribution as soon as possible, but then wait to report it on our 2022 tax return. It would be on that tax return that we would fill out the form 5923 and ask for a waiver, Is that correct?