Excess Contribution to Roth IRA pre-deadline applied to subsequent year - writing-in 1099R & 5329 help

I discovered last month that I'd run afoul of the rule re: excess contributions to my Roth IRA. Despite no earned income in 2023, I contributed $4081. Contacted my broker and they applied the contribution plus $395.11 in capital gains to my 2024 Roth IRA contribution for a total 2024 contribution of $5,196.11 - I'm earning income this year so I won't have the same issue. But the broker won't send out a 1099-R or 5329 until May. 

 

From what I've read, given the timeline and actions taken, I shouldn't owe a penalty. But when I walk through the steps to write-in a 1099R, I still end up with a penalty owed of $288. I assume I'm missing how to write-in a 5329. I'm hoping I don't need to wait to get those forms to file my taxes since I appear to have the information those forms would contain.

 

I've read posts by @DanaB27 that were very detailed regarding writing-in a 1099-R but didn't deal with this exact issue of applying excess contribution to the subsequent year in a timely fashion so as not to require paying a penalty.  Thank you for any assistance.