Roth 401K Partial Distribution (Contributions only) is being taxed on Full Amount

I have a 1099-R from Edward Jones for a Gross Distribution of $16,500 for 2023 from a Roth 401K.  That form shows "Taxable amount not determined" (no Federal tax withheld either), and Box 7 is shows Code "J" for Early Withdrawl from Roth 401K.  I am 47 years old, so well below the 59 1/2 cutoff.  Box 5 "Designated Roth Contributions" is $0 on this 1099-R form, and after calling Edwards Jones, they informed me it's my responsibility to track this, and that all financial institutions report this same way (they will not change my 1099-R).  However, prior to making those withdrawls (it was a series of smaller withdrawls that added to the $16,500), I confirmed with Edward Jones each time that the full $16,500 was covered by Contributions and does NOT tap into earnings.  But, they do not report that on this 1099-R, as it's "my responsibility".  The account was opened in 2015 (longer than 5 years ago).  My understanding is this withdrawl is NOT taxable and there should be NO penalty because I'm only taking out original contributions.  What is the correct course of action to reverse the taxation in TurboTax to avoid getting hit with taxes on this distribution?  Do I need to add the $16,500 to Box 5 as "my contributions" (even though it's not reported from Edard Jones 1099-R), or do I need to change the "J" (Early Distribution from Roth 401k) in Box 7 to the code 7B to show "Normal Distribution from a Designated Roth Account" (even though that's not what is reported on the 1099-R)?    I  want to make sure I do this right!  Thank you for any insight here!