What a mess! And the last time I checked, the IRS didn't have any of my income on my wage & income transcript.
If both 1099R forms were filed as original, then yes, it should show up twice, and I'm not 100% sure that filing a 3rd one marked corrected will fix this.
Keep the documentation handy and wait for a CP2000. Should be easy enough to explain.