"The 6% penalty on the contribution is the real issue though."

No, it's not. You told us you took it out before the tax filing due date (and there is another 6 month margin, for good measure). You don't need to be concerned about everything that doesn't apply.

I mentioned investopedia articles. You asked for help. Are you using the resources offered?

"You won't face any penalties if you simply withdraw your excess contribution—plus any income it has earned in the meantime—by the due date for your tax return, including extensions. You will, however, have to include the earnings portion in your taxable income for the year.

The technical term for these earnings is net income attributable (NIA)."

Use these articles:

https://www.investopedia.com/what-to-do-if-you-contribute-too-much-to-your-roth-ira-4770686

https://www.investopedia.com/articles/retirement/04/042804.asp

I got my mother to put the proceeds of her house into Treasury Direct. They're pushing 5.5%, and you can reinvest automatically (turn over the same investment up to two years). Even the 4 week is over 5%. She loves it. At 87 and now a widow, I think she just likes being in full control and likes the visibility.