Do we need to fill out lines 8 and 16 of form 8606 for backdoor Roth?

I feel like I'm going crazy here. It literally says to put the amount we converted from traditional IRA to Roth IRA on line 8 and 16. And yet our CPA is refusing to do so. He says

"The instructions for Form 8606 line 7 (see attached on page 10 highlighted in yellow) says that if you made contributions for 2025 to a traditional IRA that may not be fully deductible because of the income limits, to see Publication 590-B.

Publication 590-B on page 16 (see attached highlighted in yellow) says that to report your non-taxable distribution and to figure the remaining basis in your traditional IRA after distributions, you must complete Worksheet 1-1 (contained in the instructions for Publication 590-B) before completing Form 8606. Then it says that if line 5 of Form 8606 is equal to or greater than line 8 of Worksheet 1-1, follow instructions for step 6 and 7 next, and it says to not complete lines 6 through 12 of Form 8606. Then in step 6 it says to enter the amount from line 8 of Worksheet 1-1 on lines 13 and 17 of Form 8606.

So to accomplish the tracking of basis, you simply need to keep all of your Forms 8606 as evidence that you did the backdoor Roth contribution each year and total up the amount. It’s very nuanced but unfortunately that is the way the IRS (and our tax software) is telling us to do it."

Why is he even referencing line 7 when line 7 says to not include Roth IRA conversions?