You must add back the Roth conversion amount to the year end balance, before calculating the divisor.
That's just the way it is.
See 8606 Line 8,9.
In any case, the tax software does all this arithmetic for you.
Keep a paper copy of 8606 showing your new basis Line 14.
