"otherwise you will keep going in circles."

Yes, that is what I described for qualifying for a partial contribution. If they didn't take out as much as they should have, that is subject to the 6% penalty, since it still is in the account, unless you get them to take out another corrective distribution next week.