Sounds very frustrating. I'm not sure whether an amended return will help or add to the confusion. I've read that IRS routinely fixes this type of error (recovery rebate credit). Good luck with your situation.
