Retirement tax questions

I am in the exact same situation.  Do we just continue to wait for a fix?  I was able to remove the D from the code box and answer a few more questions.  TT accepted it that way and ready to submit.  I haven’t yet because it’s not correct.  Thoughts?