The solution is to fix the excess contribution situation timely and then wait to amend the return until the original return has fully processed. Nothing is stopping you from correcting the contribution situation before you can amend the return.
