Yes 2024 8606 looks wrong, seems the conversion was missing (line 13 in your screenshot shows $0 not $7004) it just shows a contribution. I think your understanding of what it should look like is correct, similar to 2023. you'll need to file an amended return for that, it may affect your 1040 as well as 8606 if the 1099-R was not reported.
Note on your 2023 Form 8606 you see the asterisks this indicates the calculation is happening on a separate IRA worksheet which should be in your PDF with all forms and worksheets (or in Forms mode if using desktop).
For 2025 you'll need to make sure you have the right basis carryover from your revised 2024 8606 Line 14 to 2025 8606 Line 2. After you enter the contribution or 1099-R you will be asked to confirm the basis tracked for 2024 or before and can adjust it there.
If you still have a residual balance/basis I would suggest converting the entire balance and clear it out to $0 this year and going forward. I assume you're picking up some interest inbetween settlement of the contribution and conversion which can happen at brokers like Vanguard etc.
see this thread on suggestions how to file - technically you could wait and do it in sequence but as suggested by @dmertz you probably don't need to wait to amend 2024 to file 2025 - as long as you are certain of the basis carryover for 2025 so you don't have to amend 2025 later.
https://ttlc.intuit.com/community/taxes/discussion/what-s-the-best-sequence-timing/00/3871012
