It has been a while since I dealt with this situation.
As an update, my taxes were filed with no problems. I have also filed 2020 and 2021 (not back yet) with no problems.
I made it a point to keep records of everything and will hold on to it for a while. I also have made it a point to now keep track of my retirement contributions in a spreadsheet so I can ensure that if I ever need to take a loan I am properly tracking the contribution year to ensure it is eligible. This includes resetting the clock on the loan money that I rolled into an IRA.
Good luck in your situation. You should already feel lucky that you are not dealing with Fidelity as they did not make the process easy. Keep us updated.