Correct. The relative timing of the Roth conversion and the rollover of the remainder of the traditional IRA balance to the 401(k) is irrelevant as long as both are reportable on the 2020 tax return.
