Is "the upper right side when driving" the rear doorway frame?
If not, then the below might help.
We have had the wind noise from the upper front door angled frame.
I have placed a 2x4's end against the middle of door edge and used a small sledge to move the upper door more to the front of the frame. That solved our noise problem. I have done this at least 3 times during our 19 year saga.
The affinity and magna odd upper door style causes the hinges to sag toward the rear of the rig.