Follow-up:
Manually overriding the incorrect 2024 values on a couple of worksheets did the trick and only required an hour of time. It helped to print out the 2025 .pdf to search for '2024' instances, then find them in TurboTax and update manually. Also helped to have my correct 2024 all forms .pdf on hand to copy the values from.
