You are doing all this just to be safe.
Any professional tax software is going to generate Form 8606 for a non-deductible contribution.
The person doing your taxes would then ask you if you filed any Form 8606 previously. That's important.
Maybe you don't remember such a discussion.
@panacea6565
