The bank's form 1042-S is based on information that they had at the time. When information conflicts, make adjustments as needed to represent what is true. Since you are a resident alien and can prove it, then treat the form as a 1099, since you can't be both a resident alien and a non-resident alien at the same time.
