If you've filed 941X requesting refunds then don't take the credit on 1120S.   Amending the amended 941X sounds like a problem waiting to happen.    

I haven't read the recent guidance but I thought the ERC was handled by reducing wages on 1120S.