Hello.  Did you ever find a solution for this?  I am having this same problem for a client that overcontributed to Roth in 2021 and withdrew it in 2022.  The modified AGI keeps changing and says that there is an additional excess contribution now...  I hope you found a solution!  I really need one!  Thank you in advance.