It is indeed the proper year - the 5498 that lists the traditional IRA contribution is for the same year of the 1098-R with the conversion.

In other words, the creation of basis prevents all of the 1098-R distribution from being taxable? If so, that clarifies.