Yes, it would be best if a broker generated a corrected 1099-R, the code they would need to use is Code 8. Code 8 is used to report Excess contributions plus earnings/excess deferrals according to IRS Form 1099-R instructions.
