Retirement tax questions

I tried calling TT again today and after a half hour or so, their rep gave up and said they were still working on it.  I don't have much hope.  I think the best thing to do at this point is to print the return, deduct the MRD redeposit from the amount shown on the 1099-R, attach the 5498, write in rollover on line 4b, and mail it in.  I guess I will have to do the same thing with the state return.